Changed implementation of LOCK option to unprefix Table instead of re…

…lying on new BareTable type

.eslintrc.json

@@ -40,7 +40,12 @@
       }
     ],
     "no-unused-vars": "off",
-    "@typescript-eslint/no-unused-vars": "warn",
+    "@typescript-eslint/no-unused-vars": [
+      "warn",
+      {
+        "varsIgnorePattern": "^_"
+      }
+    ],
     "@typescript-eslint/await-thenable": "error",
     "@typescript-eslint/no-floating-promises": "error",
     "@typescript-eslint/member-delimiter-style": [

src/db/canary.ts

@@ -9,4 +9,4 @@ Released under the MIT licence: see LICENCE file
  * generated schema format, in order to raise a type error and thereby force
  * schema regeneration.
  */
-export interface SchemaVersionCanary { version: 105 }
+export interface SchemaVersionCanary { version: 104 }

src/db/shortcuts.ts

@@ -16,7 +16,6 @@ import type {
   Updatable,
   Whereable,
   Table,
-  BareTable,
   Column,
 } from 'zapatos/schema';
 
@@ -386,9 +385,11 @@ interface OrderSpecForTable<T extends Table> {
   nulls?: 'FIRST' | 'LAST';
 }
 
+type Unprefixed<S extends string> = S extends `${infer _}.${infer Rest}` ? Rest : S;
+
 export interface SelectLockingOptions<A extends string> {
   for: 'UPDATE' | 'NO KEY UPDATE' | 'SHARE' | 'KEY SHARE';
-  of?: BareTable | A | (BareTable | A)[];
+  of?: Unprefixed<Table> | A | (Unprefixed<Table> | A)[];
   wait?: 'NOWAIT' | 'SKIP LOCKED';
 }
 

src/generate/tables.ts

@@ -188,7 +188,6 @@ export const definitionForRelationInSchema = async (
     tableDef = `${tableComment}
 export namespace ${rel.name} {
   export type Table = '${schemaPrefix}${rel.name}';
-  export type BareTable = '${rel.name}';
   export interface Selectable {
     ${selectables.join('\n    ')}
   }
@@ -237,7 +236,6 @@ export const crossTableTypesForTables = (tables: Relation[]) => `${tables.length
   '\n// `never` rather than `any` types would be more accurate in this no-tables case, but they stop `shortcuts.ts` compiling\n' : ''
   }
 export type Table = ${tableMappedUnion(tables, 'Table')};
-export type BareTable = ${tableMappedUnion(tables, 'BareTable')};
 export type Selectable = ${tableMappedUnion(tables, 'Selectable')};
 export type JSONSelectable = ${tableMappedUnion(tables, 'JSONSelectable')};
 export type Whereable = ${tableMappedUnion(tables, 'Whereable')};
@@ -268,7 +266,6 @@ const
 export const crossSchemaTypesForSchemas = (schemas: string[]) => `
 export type Schema = ${schemas.map(s => `'${s}'`).join(' | ')};
 export type Table = ${schemaMappedUnion(schemas, 'Table')};
-export type BareTable = ${schemaMappedUnion(schemas, 'BareTable')};
 export type Selectable = ${schemaMappedUnion(schemas, 'Selectable')};
 export type JSONSelectable = ${schemaMappedUnion(schemas, 'JSONSelectable')};
 export type Whereable = ${schemaMappedUnion(schemas, 'Whereable')};

src/generate/tsOutput.ts

@@ -25,7 +25,7 @@ export interface CustomTypes {
 }
 
 const
-  canaryVersion: SchemaVersionCanary['version'] = 105,
+  canaryVersion: SchemaVersionCanary['version'] = 104,
   versionCanary = `
 // got a type error on schemaVersionCanary below? update by running \`npx zapatos\`
 export interface schemaVersionCanary extends db.SchemaVersionCanary { version: ${canaryVersion} }

src/typings/zapatos/schema.ts

@@ -11,7 +11,6 @@ export interface Updatable { [k: string]: any }
 export interface Whereable { [k: string]: any }
 export interface Insertable { [k: string]: any }
 export type Table = string;
-export type BareTable = string;
 export type Column = string;
 export type JSONSelectableForTable<T extends Table> = { [k: string]: any };
 export type SelectableForTable<T extends Table> = { [k: string]: any };