Merge commit 'e5cd57623f7caa3cb5f9c790cf6b24935b46b042' into alternation-engine

Author: AlexBlokh

drizzle-orm/src/cockroach-core/table.ts

@@ -73,6 +73,7 @@ export type CockroachTableWithColumns<T extends TableConfig> =
 	& T['columns']
 	& InferTableColumnsModels<T['columns']>
 	& {
+		/** @deprecated use `cockroachTable.withRLS()` instead*/
 		enableRLS: () => Omit<
 			CockroachTableWithColumns<T>,
 			'enableRLS'

drizzle-orm/src/pg-core/table.ts

@@ -65,7 +65,14 @@ export type PgTableWithColumns<
 > =
 	& PgTable<T>
 	& T['columns']
-	& InferTableColumnsModels<T['columns']>;
+	& InferTableColumnsModels<T['columns']>
+	& {
+		/** @deprecated use `pgTable.withRLS()` instead*/
+		enableRLS: () => Omit<
+			PgTableWithColumns<T>,
+			'enableRLS'
+		>;
+	};
 
 /** @internal */
 export function pgTableWithSchema<
@@ -123,7 +130,17 @@ export function pgTableWithSchema<
 		table[PgTable.Symbol.ExtraConfigBuilder] = extraConfig as any;
 	}
 
-	return table as any;
+	return Object.assign(table, {
+		enableRLS: () => {
+			table[PgTable.Symbol.EnableRLS] = true;
+			return table as PgTableWithColumns<{
+				name: TTableName;
+				schema: TSchemaName;
+				columns: BuildColumns<TTableName, TColumnsMap, 'pg'>;
+				dialect: 'pg';
+			}>;
+		},
+	}) as any;
 }
 
 export interface PgTableFnInternal<TSchema extends string | undefined = undefined> {