orange-orm 5.0.0-beta.0 → 5.0.0-beta.2

package/README.md

@@ -51,7 +51,7 @@ Watch the [tutorial video on YouTube](https://youtu.be/1IwwjPr2lMs)
 ![Relations diagram](./docs/diagram.svg)  
 
 <sub>📄 map.ts</sub>
-```ts
+```javascript
 import orange from 'orange-orm';
 
 const map = orange.map(x => ({
@@ -88,7 +88,7 @@ const map = orange.map(x => ({
     street: column('street').string(),
     postalCode: column('postalCode').string(),
     postalPlace: column('postalPlace').string(),
-    countryCode: column('countryCode').string().enum(['NO', 'SE', 'DK', 'FI', 'IS', 'DE', 'FR', 'NL', 'ES', 'IT']),
+    countryCode: column('countryCode').string(),
   }))
 
 })).map(x => ({
@@ -106,7 +106,7 @@ export default map;
 ```  
 <sub>📄 update.ts</sub>
 
-```ts
+```javascript
 import map from './map';
 const db = map.sqlite('demo.db');
 
@@ -127,7 +127,7 @@ async function updateRow() {
 ```
 <sub>📄 filter.ts</sub>
 
-```ts
+```javascript
 import map from './map';
 const db = map.sqlite('demo.db');
 
@@ -157,8 +157,7 @@ Each column within your database table is designated by using the <strong><i>col
 Relationships between tables can also be outlined. By using methods like <strong><i>hasOne</i></strong>, <strong><i>hasMany</i></strong>, and <strong><i>references</i></strong>, you can establish connections that reflect the relationships in your data schema. In the example below, an 'order' is linked to a 'customer' reference, a 'deliveryAddress', and multiple 'lines'. The hasMany and hasOne relations represents ownership - the tables 'deliveryAddress' and 'orderLine' are owned by the 'order' table, and therefore, they contain the 'orderId' column referring to their parent table, which is 'order'. The similar relationship exists between orderLine and package - hence the packages are owned by the orderLine. Conversely, the customer table is independent and can exist without any knowledge of the 'order' table. Therefore we say that the order table <i>references</i> the customer table - necessitating the existence of a 'customerId' column in the 'order' table.</p>
 
 <sub>📄 map.ts</sub>
-
-```ts
+```javascript
 import orange from 'orange-orm';
 
 const map = orange.map(x => ({
@@ -194,7 +193,7 @@ const map = orange.map(x => ({
     street: column('street').string(),
     postalCode: column('postalCode').string(),
     postalPlace: column('postalPlace').string(),
-    countryCode: column('countryCode').string().enum(['NO', 'SE', 'DK', 'FI', 'IS', 'DE', 'FR', 'NL', 'ES', 'IT']),
+    countryCode: column('countryCode').string(),
   }))
 
 })).map(x => ({
@@ -219,8 +218,7 @@ Then, we define a SQL string. This string outlines the structure of our SQLite d
 Because of a peculiarity in SQLite, which only allows one statement execution at a time, we split this SQL string into separate statements. We do this using the split() method, which breaks up the string at every semicolon.  
 
 <sub>📄 init.ts</sub>
-
-```ts
+```javascript
 import map from './map';
 const db = map.sqlite('demo.db');
 
@@ -339,7 +337,7 @@ await db.transaction(async (db) => {
 __From the browser__  
 You can securely use Orange from the browser by utilizing the Express plugin, which serves to safeguard sensitive database credentials from exposure at the client level. This technique bypasses the need to transmit raw SQL queries directly from the client to the server. Instead, it logs method calls initiated by the client, which are later replayed and authenticated on the server. This not only reinforces security by preventing the disclosure of raw SQL queries on the client side but also facilitates a smoother operation. Essentially, this method mirrors a traditional REST API, augmented with advanced TypeScript tooling for enhanced functionality. You can read more about it in the section called [In the browser](#user-content-in-the-browser)  
 <sub>📄 server.ts</sub>
-```ts
+```javascript
 import map from './map';
 import { json } from 'body-parser';
 import express from 'express';
@@ -356,7 +354,7 @@ express().disable('x-powered-by')
 ```
 
 <sub>📄 browser.ts</sub>
-```ts
+```javascript
 import map from './map';
 
 const db = map.http('http://localhost:3000/orange');
@@ -434,7 +432,7 @@ database_id = "<your-guid-for-the-database>"
 ```
 
 <sub>📄 src/index.ts</sub>  
-```ts
+```javascript
 import map from './map';
 
 export interface Env {
@@ -1176,7 +1174,7 @@ Raw sql queries, raw sql filters and transactions are disabled at the http clien
 
 <sub>📄 server.ts</sub>
 
-```ts
+```javascript
 import map from './map';
 import { json } from 'body-parser';
 import express from 'express';
@@ -1193,7 +1191,7 @@ express().disable('x-powered-by')
 ```
 
 <sub>📄 browser.ts</sub>
-```ts
+```javascript
 import map from './map';
 
 const db = map.http('http://localhost:3000/orange');
@@ -1224,7 +1222,7 @@ One notable side effect compared to the previous example, is that only the order
 
 <sub>📄 server.ts</sub>
 
-```ts
+```javascript
 import map from './map';
 import { json } from 'body-parser';
 import express from 'express';
@@ -1259,7 +1257,7 @@ function validateToken(req, res, next) {
 
 <sub>📄 browser.ts</sub>
 
-```ts
+```javascript
 import map from './map';
 
 const db = map.http('http://localhost:3000/orange');
@@ -1303,8 +1301,9 @@ async function updateRows() {
 
 ```
 
-__Row Level Security__  
+__Row Level Security (Postgres)__  
 You can enforce tenant isolation at the database level by combining Postgres RLS with Express hooks. The example below mirrors the “Interceptors and base filter” style by putting the tenant id in a (fake) token on the client, then extracting it on the server and setting it inside the transaction. This is convenient for a demo because we can seed data and prove rows are filtered. In a real application you must validate signatures and derive tenant id from a trusted identity source, not from arbitrary client input.  
+Available transaction hooks are `beforeBegin`, `afterBegin`, `beforeCommit`, `afterCommit`, and `afterRollback`.
 
 <sub>📄 setup.sql</sub>
 
@@ -1331,7 +1330,7 @@ insert into tenant_data (tenant_id, value) values
 
 <sub>📄 server.ts</sub>
 
-```ts
+```javascript
 import map from './map';
 import { json } from 'body-parser';
 import express from 'express';
@@ -1346,7 +1345,6 @@ express().disable('x-powered-by')
   .use('/orange', db.express({
     hooks: {
       transaction: {
-        //beforeBegin: async (db, req) => ...,
         afterBegin: async (db, req) => {
           const tenantId = Number.parseInt(String(req.user?.tenantId ?? ''), 10);
           if (!Number.isFinite(tenantId)) throw new Error('Missing tenant id');
@@ -1355,12 +1353,7 @@ express().disable('x-powered-by')
             sql: 'select set_config(\'app.tenant_id\', ?, true)',
             parameters: [String(tenantId)]
           });
-        },
-        //beforeCommit: async (db, req) => ...,
-        //afterCommit: async (db, req) => ...,
-        // afterRollback: async (db, req, error) => {
-        //   console.dir(error);
-        // }
+        }
       }
     }
   }))
@@ -1389,7 +1382,7 @@ function decodeFakeJwt(token) {
 
 <sub>📄 browser.ts</sub>
 
-```ts
+```javascript
 import map from './map';
 
 const db = map.http('http://localhost:3000/orange');
@@ -1802,8 +1795,7 @@ async function execute() {
 - **`json`** and **`jsonOf<T>`** are represented as an object or array in javascript and maps to JSON, JSONB, NVARCHAR(max) or TEXT (sqlite) in sql.
 
 <sub>📄 map.ts</sub>
-
-```ts
+```javascript
 import orange from 'orange-orm';
 
 interface Pet {
@@ -1826,8 +1818,7 @@ const map = orange.map(x => ({
 }));
 ```
 <sub>📄 map.js</sub>
-
-```js
+```javascript
 import orange from 'orange-orm';
 
 /**
@@ -1854,138 +1845,6 @@ const map = orange.map(x => ({
 ```
 </details>
 
-<details id="enums"><summary><strong>Enums</strong></summary>
-<p>Enums can be defined using object literals, arrays, or TypeScript enums. The <strong><i>enum(...)</i></strong> method uses literal types when possible, so prefer patterns that keep literals (inline objects, <code>as const</code>, or <code>Object.freeze</code> in JS).</p>
-
-<sub>📄 map.ts (TypeScript enum)</sub>
-
-```ts
-enum CountryCode {
-  NORWAY = 'NO',
-  SWEDEN = 'SE',
-  DENMARK = 'DK',
-  FINLAND = 'FI',
-  ICELAND = 'IS',
-  GERMANY = 'DE',
-  FRANCE = 'FR',
-  NETHERLANDS = 'NL',
-  SPAIN = 'ES',
-  ITALY = 'IT',
-}
-
-const map = orange.map(x => ({
-  deliveryAddress: x.table('deliveryAddress').map(({ column }) => ({
-    id: column('id').numeric().primary(),
-    name: column('name').string(),
-    street: column('street').string(),
-    postalCode: column('postalCode').string(),
-    postalPlace: column('postalPlace').string(),
-    countryCode: column('countryCode').string().enum(CountryCode),
-  }))
-}));
-```
-
-
-<sub>📄 map.ts (as const)</sub>
-
-```ts
-const Countries = {
-  NORWAY: 'NO',
-  SWEDEN: 'SE',
-  DENMARK: 'DK',
-  FINLAND: 'FI',
-  ICELAND: 'IS',
-  GERMANY: 'DE',
-  FRANCE: 'FR',
-  NETHERLANDS: 'NL',
-  SPAIN: 'ES',
-  ITALY: 'IT',
-} as const;
-
-const map = orange.map(x => ({
-  deliveryAddress: x.table('deliveryAddress').map(({ column }) => ({
-    id: column('id').numeric().primary(),
-    name: column('name').string(),
-    street: column('street').string(),
-    postalCode: column('postalCode').string(),
-    postalPlace: column('postalPlace').string(),
-    countryCode: column('countryCode').string().enum(Countries),
-  }))
-}));
-```
-
-<sub>📄 map.ts (array)</sub>
-
-```ts
-const map = orange.map(x => ({
-  deliveryAddress: x.table('deliveryAddress').map(({ column }) => ({
-    id: column('id').numeric().primary(),
-    name: column('name').string(),
-    street: column('street').string(),
-    postalCode: column('postalCode').string(),
-    postalPlace: column('postalPlace').string(),
-    countryCode: column('countryCode').string().enum(
-      ['NO', 'SE', 'DK', 'FI', 'IS', 'DE', 'FR', 'NL', 'ES', 'IT']
-    ),
-  }))
-}));
-```
-
-<sub>📄 map.ts (literal object)</sub>
-
-```ts
-const map = orange.map(x => ({
-  deliveryAddress: x.table('deliveryAddress').map(({ column }) => ({
-    id: column('id').numeric().primary(),
-    name: column('name').string(),
-    street: column('street').string(),
-    postalCode: column('postalCode').string(),
-    postalPlace: column('postalPlace').string(),
-    countryCode: column('countryCode').string().enum({
-      NORWAY: 'NO',
-      SWEDEN: 'SE',
-      DENMARK: 'DK',
-      FINLAND: 'FI',
-      ICELAND: 'IS',
-      GERMANY: 'DE',
-      FRANCE: 'FR',
-      NETHERLANDS: 'NL',
-      SPAIN: 'ES',
-      ITALY: 'IT',
-    }),
-  }))
-}));
-```
-
-<sub>📄 map.js (Object.freeze)</sub>
-
-```js
-const Countries = Object.freeze({
-  NORWAY: 'NO',
-  SWEDEN: 'SE',
-  DENMARK: 'DK',
-  FINLAND: 'FI',
-  ICELAND: 'IS',
-  GERMANY: 'DE',
-  FRANCE: 'FR',
-  NETHERLANDS: 'NL',
-  SPAIN: 'ES',
-  ITALY: 'IT',
-});
-
-const map = orange.map(x => ({
-  deliveryAddress: x.table('deliveryAddress').map(({ column }) => ({
-    id: column('id').numeric().primary(),
-    name: column('name').string(),
-    street: column('street').string(),
-    postalCode: column('postalCode').string(),
-    postalPlace: column('postalPlace').string(),
-    countryCode: column('countryCode').string().enum(Countries),
-  }))
-}));
-```
-</details>
-
 <details id="default-values"><summary><strong>Default values</strong></summary>
 <p>Utilizing default values can be especially useful for automatically populating these fields when the underlying database doesn't offer native support for default value generation.  
 
@@ -2012,7 +1871,7 @@ export default map;
 <p>In the previous sections you have already seen the <strong><i>notNull()</i></strong> validator being used on some columns. This will not only generate correct typescript mapping, but also throw an error if value is set to null or undefined. However, sometimes we do not want the notNull-validator to be run on inserts. Typically, when we have an autoincremental key or server generated uuid, it does not make sense to check for null on insert. This is where <strong><i>notNullExceptInsert()</strong></i> comes to rescue. You can also create your own custom validator as shown below. The last kind of validator, is the <a href="https://ajv.js.org/json-schema.html">ajv JSON schema validator</a>. This can be used on json columns as well as any other column type.</p>
 
 <sub>📄 map.ts</sub>
-```ts
+```javascript
 import orange from 'orange-orm';
 
 interface Pet {
@@ -2043,7 +1902,7 @@ const map = orange.map(x => ({
 export default map;
 ```
 <sub>📄 map.js</sub>
-```js
+```javascript
 import orange from 'orange-orm';
 
 /**
@@ -2253,7 +2112,7 @@ async function getCount() {
 
 <sub>📄 map.ts</sub>
 
-```ts
+```javascript
 import orange from 'orange-orm';
 
 const map = orange.map(x => ({
@@ -2269,7 +2128,7 @@ export default map;
 ```
 <sub>📄 sensitive.ts</sub>
 
-```ts
+```javascript
 import map from './map';
 const db = map.sqlite('demo.db');
 

package/dist/index.browser.mjs

@@ -5886,37 +5886,6 @@ function requireColumn () {
 			return c;
 		};
 
-		c.enum = function(values) {
-			let list = values;
-			if (Array.isArray(values))
-				list = values;
-			else if (values && typeof values === 'object') {
-				const keys = Object.keys(values);
-				const nonNumericKeys = keys.filter((key) => !/^-?\d+$/.test(key));
-				list = (nonNumericKeys.length ? nonNumericKeys : keys).map((key) => values[key]);
-			}
-			else
-				throw new Error('enum values must be an array');
-			const allowed = new Set(list);
-			column.enum = list;
-			function validate(value) {
-				if (value === undefined || value === null)
-					return;
-				if (!allowed.has(value)) {
-					const formatted = list.map((v) => JSON.stringify(v)).join(', ');
-					throw new Error(`Column ${column.alias} must be one of: ${formatted}`);
-				}
-			}
-			return c.validate(validate);
-		};
-
-		c.enum2 = function(...values) {
-			const list = values.length === 1 && Array.isArray(values[0])
-				? values[0]
-				: values;
-			return c.enum(list);
-		};
-
 		c.default = function(value) {
 			column.default = value;
 			return c;
@@ -5932,6 +5901,7 @@ function requireColumn () {
 			var oldAlias = column.alias;
 			table._aliases.delete(oldAlias);
 			table._aliases.add(alias);
+			delete table[oldAlias];
 			table[alias] = column;
 			column.alias = alias;
 			return c;

package/dist/index.mjs

@@ -5887,37 +5887,6 @@ function requireColumn () {
 			return c;
 		};
 
-		c.enum = function(values) {
-			let list = values;
-			if (Array.isArray(values))
-				list = values;
-			else if (values && typeof values === 'object') {
-				const keys = Object.keys(values);
-				const nonNumericKeys = keys.filter((key) => !/^-?\d+$/.test(key));
-				list = (nonNumericKeys.length ? nonNumericKeys : keys).map((key) => values[key]);
-			}
-			else
-				throw new Error('enum values must be an array');
-			const allowed = new Set(list);
-			column.enum = list;
-			function validate(value) {
-				if (value === undefined || value === null)
-					return;
-				if (!allowed.has(value)) {
-					const formatted = list.map((v) => JSON.stringify(v)).join(', ');
-					throw new Error(`Column ${column.alias} must be one of: ${formatted}`);
-				}
-			}
-			return c.validate(validate);
-		};
-
-		c.enum2 = function(...values) {
-			const list = values.length === 1 && Array.isArray(values[0])
-				? values[0]
-				: values;
-			return c.enum(list);
-		};
-
 		c.default = function(value) {
 			column.default = value;
 			return c;
@@ -5933,6 +5902,7 @@ function requireColumn () {
 			var oldAlias = column.alias;
 			table._aliases.delete(oldAlias);
 			table._aliases.add(alias);
+			delete table[oldAlias];
 			table[alias] = column;
 			column.alias = alias;
 			return c;
@@ -19655,7 +19625,7 @@ function requireOutputInsertedSql () {
 
 		function formatColumn(column) {
 			if (column.formatOut)
-				return column.formatOut(context, 'INSERTED');
+				return `${column.formatOut(context, 'INSERTED')} AS [${column._dbName}]`;
 			else
 				return `INSERTED.[${column._dbName}]`;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.0.0-beta.0",
+    "version": "5.0.0-beta.2",
     "publishConfig": {
         "access": "public"
     },

package/src/map.d.ts

@@ -96,9 +96,7 @@ type ReturnArrayOrObj<W, V1, V2> =
 	V1;
 
 
-type ColumnToType<T> = T extends EnumOf<infer E>
-	? E
-	: T extends UuidColumnSymbol
+type ColumnToType<T> = T extends UuidColumnSymbol
 	? string
 	: T extends StringColumnSymbol
 	? string
@@ -627,10 +625,6 @@ type NotNullExceptInsert = {
 	[' notNullExceptInsert']: boolean;
 };
 
-type EnumOf<T> = {
-	[' enum']: T;
-};
-
 type JsonOf<T> = {
 	[' isjsonOf']: boolean;
 	type: T;
@@ -740,11 +734,6 @@ type DateWithTimeZoneValidator<M> = M extends NotNull
 	};
 
 type StringColumnTypeDef<M> = StringValidator<M> & {
-	enum<const V extends readonly string[]>(values: V): StringColumnTypeDef<M & EnumOf<V[number]>> & EnumOf<V[number]>;
-	enum<const V extends Record<string, string>>(values: V): StringColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
-	enum<TEnum>(values: Record<string, TEnum>): StringColumnTypeDef<M & EnumOf<TEnum>> & EnumOf<TEnum>;
-	enum<E extends string>(values: readonly E[]): StringColumnTypeDef<M & EnumOf<E>> & EnumOf<E>;
-	enum<E, V extends Record<string, E>>(values: V): StringColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
 	primary(): StringColumnTypeDef<M & IsPrimary> & IsPrimary;
 	notNull(): StringColumnTypeDef<M & NotNull> & NotNull;
 	notNullExceptInsert(): StringColumnTypeDef<M & NotNull & NotNullExceptInsert> & NotNull & NotNullExceptInsert;
@@ -756,10 +745,6 @@ type StringColumnTypeDef<M> = StringValidator<M> & {
 	M;
 
 type NumericColumnTypeDef<M> = NumericValidator<M> & {
-	enum<const V extends Record<string, number>>(values: V): NumericColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
-	enum<TEnum>(values: Record<string, TEnum>): NumericColumnTypeDef<M & EnumOf<TEnum>> & EnumOf<TEnum>;
-	enum<E extends number>(values: readonly E[]): NumericColumnTypeDef<M & EnumOf<E>> & EnumOf<E>;
-	enum<E, V extends Record<string, E>>(values: V): NumericColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
 	primary(): NumericColumnTypeDef<M & IsPrimary> & IsPrimary;
 	notNull(): NumericColumnTypeDef<M & NotNull> & NotNull;
 	notNullExceptInsert(): NumericColumnTypeDef<M & NotNull & NotNullExceptInsert> & NotNull & NotNullExceptInsert;
@@ -771,10 +756,6 @@ type NumericColumnTypeDef<M> = NumericValidator<M> & {
 	M;
 
 type BigIntColumnTypeDef<M> = BigIntValidator<M> & {
-	enum<const V extends Record<string, bigint>>(values: V): BigIntColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
-	enum<TEnum>(values: Record<string, TEnum>): BigIntColumnTypeDef<M & EnumOf<TEnum>> & EnumOf<TEnum>;
-	enum<E extends bigint>(values: readonly E[]): BigIntColumnTypeDef<M & EnumOf<E>> & EnumOf<E>;
-	enum<E, V extends Record<string, E>>(values: V): BigIntColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
 	primary(): BigIntColumnTypeDef<M & IsPrimary> & IsPrimary;
 	notNull(): BigIntColumnTypeDef<M & NotNull> & NotNull;
 	notNullExceptInsert(): BigIntColumnTypeDef<M & NotNull & NotNullExceptInsert> & NotNull & NotNullExceptInsert;
@@ -786,10 +767,6 @@ type BigIntColumnTypeDef<M> = BigIntValidator<M> & {
 	M;
 
 type UuidColumnTypeDef<M> = UuidValidator<M> & {
-	enum<const V extends Record<string, string>>(values: V): UuidColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
-	enum<TEnum>(values: Record<string, TEnum>): UuidColumnTypeDef<M & EnumOf<TEnum>> & EnumOf<TEnum>;
-	enum<E extends string>(values: readonly E[]): UuidColumnTypeDef<M & EnumOf<E>> & EnumOf<E>;
-	enum<E, V extends Record<string, E>>(values: V): UuidColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
 	primary(): UuidColumnTypeDef<M & IsPrimary> & IsPrimary;
 	notNull(): UuidColumnTypeDef<M & NotNull> & NotNull;
 	notNullExceptInsert(): UuidColumnTypeDef<M & NotNull & NotNullExceptInsert> & NotNull & NotNullExceptInsert;
@@ -812,10 +789,6 @@ type JSONColumnTypeDef<M> = JSONValidator<M> & {
 	M;
 
 type BinaryColumnTypeDef<M> = BinaryValidator<M> & {
-	enum<const V extends Record<string, string>>(values: V): BinaryColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
-	enum<TEnum>(values: Record<string, TEnum>): BinaryColumnTypeDef<M & EnumOf<TEnum>> & EnumOf<TEnum>;
-	enum<E extends string>(values: readonly E[]): BinaryColumnTypeDef<M & EnumOf<E>> & EnumOf<E>;
-	enum<E, V extends Record<string, E>>(values: V): BinaryColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
 	primary(): BinaryColumnTypeDef<M & IsPrimary> & IsPrimary;
 	notNull(): BinaryColumnTypeDef<M & NotNull> & NotNull;
 	notNullExceptInsert(): BinaryColumnTypeDef<M & NotNull & NotNullExceptInsert> & NotNull & NotNullExceptInsert;
@@ -827,10 +800,6 @@ type BinaryColumnTypeDef<M> = BinaryValidator<M> & {
 	M;
 
 type BooleanColumnTypeDef<M> = BooleanValidator<M> & {
-	enum<const V extends Record<string, boolean>>(values: V): BooleanColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
-	enum<TEnum>(values: Record<string, TEnum>): BooleanColumnTypeDef<M & EnumOf<TEnum>> & EnumOf<TEnum>;
-	enum<E extends boolean>(values: readonly E[]): BooleanColumnTypeDef<M & EnumOf<E>> & EnumOf<E>;
-	enum<E, V extends Record<string, E>>(values: V): BooleanColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
 	primary(): BooleanColumnTypeDef<M & IsPrimary> & IsPrimary;
 	notNull(): BooleanColumnTypeDef<M & NotNull> & NotNull;
 	notNullExceptInsert(): BooleanColumnTypeDef<M & NotNull & NotNullExceptInsert> & NotNull & NotNullExceptInsert;
@@ -842,10 +811,6 @@ type BooleanColumnTypeDef<M> = BooleanValidator<M> & {
 	M;
 
 type DateColumnTypeDef<M> = DateValidator<M> & {
-	enum<const V extends Record<string, string | Date>>(values: V): DateColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
-	enum<TEnum>(values: Record<string, TEnum>): DateColumnTypeDef<M & EnumOf<TEnum>> & EnumOf<TEnum>;
-	enum<E extends string | Date>(values: readonly E[]): DateColumnTypeDef<M & EnumOf<E>> & EnumOf<E>;
-	enum<E, V extends Record<string, E>>(values: V): DateColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
 	primary(): DateColumnTypeDef<M & IsPrimary> & IsPrimary;
 	notNull(): DateColumnTypeDef<M & NotNull> & NotNull;
 	notNullExceptInsert(): DateColumnTypeDef<M & NotNull & NotNullExceptInsert> & NotNull & NotNullExceptInsert;
@@ -857,10 +822,6 @@ type DateColumnTypeDef<M> = DateValidator<M> & {
 	M;
 
 type DateWithTimeZoneColumnTypeDef<M> = DateValidator<M> & {
-	enum<const V extends Record<string, string | Date>>(values: V): DateWithTimeZoneColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
-	enum<TEnum>(values: Record<string, TEnum>): DateWithTimeZoneColumnTypeDef<M & EnumOf<TEnum>> & EnumOf<TEnum>;
-	enum<E extends string | Date>(values: readonly E[]): DateWithTimeZoneColumnTypeDef<M & EnumOf<E>> & EnumOf<E>;
-	enum<E, V extends Record<string, E>>(values: V): DateWithTimeZoneColumnTypeDef<M & EnumOf<V[keyof V]>> & EnumOf<V[keyof V]>;
 	primary(): DateWithTimeZoneColumnTypeDef<M & IsPrimary> & IsPrimary;
 	notNull(): DateWithTimeZoneColumnTypeDef<M & NotNull> & NotNull;
 	notNullExceptInsert(): DateWithTimeZoneColumnTypeDef<M & NotNull & NotNullExceptInsert> & NotNull & NotNullExceptInsert;
@@ -1039,9 +1000,7 @@ type ExtractPrimaryKeyNames<T> =
 type RelationTarget<T> =
   T extends { __tableAlias: infer S } ? Extract<S, string> : string;
 
-type EnumSchema<T> = T extends EnumOf<infer E> ? { ' enum': readonly E[] } : {};
-
-type ColumnToSchemaType<T> = (
+type ColumnToSchemaType<T> =
   T extends JsonOf<infer U>
     ? { ' type': 'json'; ' tsType': U }
       & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
@@ -1087,8 +1046,7 @@ type ColumnToSchemaType<T> = (
       & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
          : T extends NotNull ? { ' notNull': true }
          : {}) :
-  never
-) & EnumSchema<T>;
+  never;
 
 export type MappedDbDef<T> = {
   map<V extends AllowedDbMap<V>>(
@@ -1101,4 +1059,4 @@ export type MappedDbDef<T> = {
    * Usage: type Schema = ReturnType<typeof db.toSchema>
    */
   toSchema: <U = T>() => SchemaFromMappedDb<U>;
-} & T & DbConnectable<T>;
+} & T & DbConnectable<T>;

package/src/map2.d.ts

@@ -10,7 +10,6 @@ export type ORMColumnType = 'string' | 'bigint' | 'uuid' | 'date' | 'numeric' |
 // Base column definition with space-prefixed required properties
 export type ORMColumnDefinition = {
   ' type': ORMColumnType;
-  ' enum'?: readonly (string | number | boolean | Date)[] | Record<string, string | number | boolean | Date>;
   ' notNull'?: boolean;
   ' notNullExceptInsert'?: boolean;
 };
@@ -25,7 +24,7 @@ export type ORMJsonColumnDefinition<T = any> = {
 
 type NormalizeColumn<T> =
   T extends ORMColumnType
-  ? { ' type': T; ' enum'?: readonly (string | number | boolean | Date)[] | Record<string, string | number | boolean | Date>; ' notNull'?: boolean; ' notNullExceptInsert'?: boolean }
+  ? { ' type': T; ' notNull'?: boolean; ' notNullExceptInsert'?: boolean }
   : T extends { ' type': ORMColumnType }
   ? { ' notNull'?: boolean; ' notNullExceptInsert'?: boolean } & T
   : T extends { ' type': 'json'; ' tsType': any }
@@ -42,8 +41,6 @@ type IsRequiredInsert<CT> =
   : false; // Otherwise, it's optional
 
 type ColumnTypeToTS<CT> =
-  NormalizeColumn<CT> extends { ' enum': readonly (infer E)[] } ? E :
-  NormalizeColumn<CT> extends { ' enum': Record<string, infer E> } ? E :
   NormalizeColumn<CT>[' type'] extends 'numeric' ? number :
   NormalizeColumn<CT>[' type'] extends 'boolean' ? boolean :
   NormalizeColumn<CT>[' type'] extends 'json'
@@ -677,7 +674,7 @@ type AggregateCustomSelectorProperties<M extends Record<string, TableDefinition<
 
 export type TableClient<M extends Record<string, TableDefinition<M>>, K extends keyof M> = {
   // Array methods - return arrays with array-level active record methods, but individual items are plain
-  getMany<strategy extends FetchStrategy<M, K>>(strategy?: strategy): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, strategy>>>, M, K>>;
+  getMany<strategy extends FetchStrategy<M, K> = {}>(strategy: strategy): Promise<WithArrayActiveRecord<Array<DeepExpand<Selection<M, K, strategy>>>, M, K>>;
 
   // Aggregate methods - return plain objects (no active record methods)
   aggregate<strategy extends AggregateStrategy<M, K>>(strategy: strategy): Promise<Array<DeepExpand<AggregateCustomSelectorProperties<M, K, strategy>>>>;

package/src/table/column.js

@@ -54,37 +54,6 @@ function defineColumn(column, table) {
 		return c;
 	};
 
-	c.enum = function(values) {
-		let list = values;
-		if (Array.isArray(values))
-			list = values;
-		else if (values && typeof values === 'object') {
-			const keys = Object.keys(values);
-			const nonNumericKeys = keys.filter((key) => !/^-?\d+$/.test(key));
-			list = (nonNumericKeys.length ? nonNumericKeys : keys).map((key) => values[key]);
-		}
-		else
-			throw new Error('enum values must be an array');
-		const allowed = new Set(list);
-		column.enum = list;
-		function validate(value) {
-			if (value === undefined || value === null)
-				return;
-			if (!allowed.has(value)) {
-				const formatted = list.map((v) => JSON.stringify(v)).join(', ');
-				throw new Error(`Column ${column.alias} must be one of: ${formatted}`);
-			}
-		}
-		return c.validate(validate);
-	};
-
-	c.enum2 = function(...values) {
-		const list = values.length === 1 && Array.isArray(values[0])
-			? values[0]
-			: values;
-		return c.enum(list);
-	};
-
 	c.default = function(value) {
 		column.default = value;
 		return c;
@@ -100,6 +69,7 @@ function defineColumn(column, table) {
 		var oldAlias = column.alias;
 		table._aliases.delete(oldAlias);
 		table._aliases.add(alias);
+		delete table[oldAlias];
 		table[alias] = column;
 		column.alias = alias;
 		return c;
@@ -190,4 +160,4 @@ function inspect(obj) {
 }
 
 
-module.exports = defineColumn;
+module.exports = defineColumn;

package/src/tedious/outputInsertedSql.js

@@ -9,7 +9,7 @@ function outputInsertedSql(context, table) {
 
 	function formatColumn(column) {
 		if (column.formatOut)
-			return column.formatOut(context, 'INSERTED');
+			return `${column.formatOut(context, 'INSERTED')} AS [${column._dbName}]`;
 		else
 			return `INSERTED.[${column._dbName}]`;
 	}
@@ -17,4 +17,4 @@ function outputInsertedSql(context, table) {
 
 
 
-module.exports = outputInsertedSql;
+module.exports = outputInsertedSql;

package/deno.lock

@@ -1,76 +0,0 @@
-{
-  "version": "5",
-  "specifiers": {
-    "jsr:@std/assert@*": "1.0.17",
-    "jsr:@std/assert@^1.0.17": "1.0.17",
-    "jsr:@std/internal@^1.0.12": "1.0.12",
-    "jsr:@std/path@*": "1.1.4",
-    "jsr:@std/testing@*": "1.0.17"
-  },
-  "jsr": {
-    "@std/assert@1.0.17": {
-      "integrity": "df5ebfffe77c03b3fa1401e11c762cc8f603d51021c56c4d15a8c7ab45e90dbe",
-      "dependencies": [
-        "jsr:@std/internal"
-      ]
-    },
-    "@std/internal@1.0.12": {
-      "integrity": "972a634fd5bc34b242024402972cd5143eac68d8dffaca5eaa4dba30ce17b027"
-    },
-    "@std/path@1.1.4": {
-      "integrity": "1d2d43f39efb1b42f0b1882a25486647cb851481862dc7313390b2bb044314b5",
-      "dependencies": [
-        "jsr:@std/internal"
-      ]
-    },
-    "@std/testing@1.0.17": {
-      "integrity": "87bdc2700fa98249d48a17cd72413352d3d3680dcfbdb64947fd0982d6bbf681",
-      "dependencies": [
-        "jsr:@std/assert@^1.0.17",
-        "jsr:@std/internal"
-      ]
-    }
-  },
-  "workspace": {
-    "packageJson": {
-      "dependencies": [
-        "npm:@cloudflare/workers-types@^4.20241106.0",
-        "npm:@electric-sql/pglite@0.3",
-        "npm:@lroal/on-change@^4.0.2",
-        "npm:@rollup/plugin-commonjs@^28.0.2",
-        "npm:@rollup/plugin-json@^6.1.0",
-        "npm:@rollup/plugin-node-resolve@13",
-        "npm:@tediousjs/connection-string@~0.4.1",
-        "npm:@types/express@^4.17.13",
-        "npm:@types/oracledb@^6.0.4",
-        "npm:@types/tedious@^4.0.14",
-        "npm:@typescript-eslint/eslint-plugin@6",
-        "npm:@typescript-eslint/parser@6",
-        "npm:@vitest/coverage-v8@^3.2.4",
-        "npm:ajv@^8.17.1",
-        "npm:axios@^1.6.2",
-        "npm:better-sqlite3@^11.8.1",
-        "npm:cors@^2.8.5",
-        "npm:eslint-plugin-jest@^27.1.7",
-        "npm:eslint@^8.57.0",
-        "npm:express@^4.18.2",
-        "npm:fast-json-patch@^3.1.1",
-        "npm:findup-sync@5",
-        "npm:glob@^10.3.4 || ^11.0.2",
-        "npm:module-definition@4 || 5 || * || 6",
-        "npm:msnodesqlv8@^4.1.0",
-        "npm:mysql2@^3.9.4",
-        "npm:oracledb@^6.3.0",
-        "npm:owasp-dependency-check@^0.0.21",
-        "npm:pg-query-stream@^3.3.2",
-        "npm:pg@^8.5.1",
-        "npm:rfdc@^1.2.0",
-        "npm:rollup@^2.52.7",
-        "npm:tedious@19",
-        "npm:typescript@^5.4.5",
-        "npm:uuid@^8.3.2 || 9 || 10 || ^11.1.0",
-        "npm:vitest@^3.2.4"
-      ]
-    }
-  }
-}