Rls schema definition

drizzle-kit/src/api.ts

@@ -6,6 +6,8 @@ import {
 	columnsResolver,
 	enumsResolver,
 	mySqlViewsResolver,
+	policyResolver,
+	roleResolver,
 	schemasResolver,
 	sequencesResolver,
 	sqliteViewsResolver,
@@ -47,6 +49,7 @@ export const generateDrizzleJson = (
 		prepared.enums,
 		prepared.schemas,
 		prepared.sequences,
+		prepared.roles,
 		prepared.views,
 		prepared.matViews,
 		casing,
@@ -78,6 +81,8 @@ export const generateMigration = async (
 		schemasResolver,
 		enumsResolver,
 		sequencesResolver,
+		policyResolver,
+		roleResolver,
 		tablesResolver,
 		columnsResolver,
 		viewsResolver,
@@ -122,6 +127,8 @@ export const pushSchema = async (
 		schemasResolver,
 		enumsResolver,
 		sequencesResolver,
+		policyResolver,
+		roleResolver,
 		tablesResolver,
 		columnsResolver,
 		viewsResolver,

drizzle-kit/src/cli/commands/introspect.ts

@@ -21,6 +21,7 @@ import {
 	applySqliteSnapshotsDiff,
 } from '../../snapshotsDiffer';
 import { prepareOutFolder } from '../../utils';
+import { Entities } from '../validations/cli';
 import type { Casing, Prefix } from '../validations/common';
 import { LibSQLCredentials } from '../validations/libsql';
 import type { MysqlCredentials } from '../validations/mysql';
@@ -31,6 +32,7 @@ import {
 	columnsResolver,
 	enumsResolver,
 	mySqlViewsResolver,
+	policyResolver,
 	schemasResolver,
 	sequencesResolver,
 	sqliteViewsResolver,
@@ -47,6 +49,7 @@ export const introspectPostgres = async (
 	tablesFilter: string[],
 	schemasFilter: string[],
 	prefix: Prefix,
+	entities: Entities,
 ) => {
 	const { preparePostgresDB } = await import('../connections');
 	const db = await preparePostgresDB(credentials);
@@ -79,11 +82,18 @@ export const introspectPostgres = async (
 	};
 
 	const progress = new IntrospectProgress(true);
+
 	const res = await renderWithTask(
 		progress,
-		fromPostgresDatabase(db, filter, schemasFilter, (stage, count, status) => {
-			progress.update(stage, count, status);
-		}),
+		fromPostgresDatabase(
+			db,
+			filter,
+			schemasFilter,
+			entities,
+			(stage, count, status) => {
+				progress.update(stage, count, status);
+			},
+		),
 	);
 
 	const schema = { id: originUUID, prevId: '', ...res } as PgSchema;
@@ -106,6 +116,7 @@ export const introspectPostgres = async (
 			schemasResolver,
 			enumsResolver,
 			sequencesResolver,
+			policyResolver,
 			tablesResolver,
 			columnsResolver,
 			viewsResolver,

drizzle-kit/src/cli/commands/migrate.ts

@@ -14,7 +14,7 @@ import path, { join } from 'path';
 import { TypeOf } from 'zod';
 import type { CommonSchema } from '../../schemaValidator';
 import { MySqlSchema, mysqlSchema, squashMysqlScheme, ViewSquashed } from '../../serializer/mysqlSchema';
-import { PgSchema, pgSchema, squashPgScheme, View } from '../../serializer/pgSchema';
+import { PgSchema, pgSchema, Policy, Role, squashPgScheme, View } from '../../serializer/pgSchema';
 import { SQLiteSchema, sqliteSchema, squashSqliteScheme, View as SQLiteView } from '../../serializer/sqliteSchema';
 import {
 	applyLibSQLSnapshotsDiff,
@@ -28,6 +28,8 @@ import {
 	ResolverInput,
 	ResolverOutput,
 	ResolverOutputWithMoved,
+	RolesResolverInput,
+	RolesResolverOutput,
 	Sequence,
 	Table,
 } from '../../snapshotsDiffer';
@@ -41,6 +43,7 @@ import {
 	ResolveColumnSelect,
 	ResolveSchemasSelect,
 	ResolveSelect,
+	ResolveSelectNamed,
 	schema,
 } from '../views';
 import { GenerateConfig } from './utils';
@@ -180,6 +183,38 @@ export const sequencesResolver = async (
 	}
 };
 
+export const roleResolver = async (
+	input: RolesResolverInput<Role>,
+): Promise<RolesResolverOutput<Role>> => {
+	const result = await promptNamedConflict(
+		input.created,
+		input.deleted,
+		'role',
+	);
+	return {
+		created: result.created,
+		deleted: result.deleted,
+		renamed: result.renamed,
+	};
+};
+
+export const policyResolver = async (
+	input: ColumnsResolverInput<Policy>,
+): Promise<ColumnsResolverOutput<Policy>> => {
+	const result = await promptColumnsConflicts(
+		input.tableName,
+		input.created,
+		input.deleted,
+	);
+	return {
+		tableName: input.tableName,
+		schema: input.schema,
+		created: result.created,
+		deleted: result.deleted,
+		renamed: result.renamed,
+	};
+};
+
 export const enumsResolver = async (
 	input: ResolverInput<Enum>,
 ): Promise<ResolverOutputWithMoved<Enum>> => {
@@ -264,6 +299,8 @@ export const prepareAndMigratePg = async (config: GenerateConfig) => {
 			schemasResolver,
 			enumsResolver,
 			sequencesResolver,
+			policyResolver,
+			roleResolver,
 			tablesResolver,
 			columnsResolver,
 			viewsResolver,
@@ -310,6 +347,8 @@ export const preparePgPush = async (
 		schemasResolver,
 		enumsResolver,
 		sequencesResolver,
+		policyResolver,
+		roleResolver,
 		tablesResolver,
 		columnsResolver,
 		viewsResolver,
@@ -736,6 +775,78 @@ export const promptColumnsConflicts = async <T extends Named>(
 	return result;
 };
 
+export const promptNamedConflict = async <T extends Named>(
+	newItems: T[],
+	missingItems: T[],
+	entity: 'role',
+): Promise<{
+	created: T[];
+	renamed: { from: T; to: T }[];
+	deleted: T[];
+}> => {
+	if (missingItems.length === 0 || newItems.length === 0) {
+		return {
+			created: newItems,
+			renamed: [],
+			deleted: missingItems,
+		};
+	}
+
+	const result: {
+		created: T[];
+		renamed: { from: T; to: T }[];
+		deleted: T[];
+	} = { created: [], renamed: [], deleted: [] };
+	let index = 0;
+	let leftMissing = [...missingItems];
+	do {
+		const created = newItems[index];
+		const renames: RenamePropmtItem<T>[] = leftMissing.map((it) => {
+			return { from: it, to: created };
+		});
+
+		const promptData: (RenamePropmtItem<T> | T)[] = [created, ...renames];
+
+		const { status, data } = await render(
+			new ResolveSelectNamed<T>(created, promptData, entity),
+		);
+		if (status === 'aborted') {
+			console.error('ERROR');
+			process.exit(1);
+		}
+
+		if (isRenamePromptItem(data)) {
+			console.log(
+				`${chalk.yellow('~')} ${data.from.name} › ${data.to.name} ${
+					chalk.gray(
+						`${entity} will be renamed/moved`,
+					)
+				}`,
+			);
+
+			if (data.from.name !== data.to.name) {
+				result.renamed.push(data);
+			}
+
+			delete leftMissing[leftMissing.indexOf(data.from)];
+			leftMissing = leftMissing.filter(Boolean);
+		} else {
+			console.log(
+				`${chalk.green('+')} ${data.name} ${
+					chalk.gray(
+						`${entity} will be created`,
+					)
+				}`,
+			);
+			result.created.push(created);
+		}
+		index += 1;
+	} while (index < newItems.length);
+	console.log(chalk.gray(`--- all ${entity} conflicts resolved ---\n`));
+	result.deleted.push(...leftMissing);
+	return result;
+};
+
 export const promptNamedWithSchemasConflict = async <T extends NamedWithSchema>(
 	newItems: T[],
 	missingItems: T[],

drizzle-kit/src/cli/commands/pgIntrospect.ts

@@ -4,12 +4,14 @@ import { originUUID } from '../../global';
 import type { PgSchema } from '../../serializer/pgSchema';
 import { fromDatabase } from '../../serializer/pgSerializer';
 import type { DB } from '../../utils';
+import { Entities } from '../validations/cli';
 import { ProgressView } from '../views';
 
 export const pgPushIntrospect = async (
 	db: DB,
 	filters: string[],
 	schemaFilters: string[],
+	entities: Entities = { roles: true },
 ) => {
 	const matchers = filters.map((it) => {
 		return new Minimatch(it);
@@ -43,7 +45,7 @@ export const pgPushIntrospect = async (
 	);
 	const res = await renderWithTask(
 		progress,
-		fromDatabase(db, filter, schemaFilters),
+		fromDatabase(db, filter, schemaFilters, entities),
 	);
 
 	const schema = { id: originUUID, prevId: '', ...res } as PgSchema;

drizzle-kit/src/cli/commands/pgPushUtils.ts

@@ -252,18 +252,12 @@ export const pgSuggestions = async (db: DB, statements: JsonStatement[]) => {
 		}
 		const stmnt = fromJson([statement], 'postgresql');
 		if (typeof stmnt !== 'undefined') {
-			if (statement.type === 'drop_table') {
-				statementsToExecute.push(
-					`DROP TABLE ${concatSchemaAndTableName(statement.schema, statement.tableName)} CASCADE;`,
-				);
-			} else {
-				statementsToExecute.push(...stmnt);
-			}
+			statementsToExecute.push(...stmnt);
 		}
 	}
 
 	return {
-		statementsToExecute,
+		statementsToExecute: [...new Set(statementsToExecute)],
 		shouldAskForApprove,
 		infoToPrint,
 		matViewsToRemove: [...new Set(matViewsToRemove)],

drizzle-kit/src/cli/commands/push.ts

@@ -2,6 +2,7 @@ import chalk from 'chalk';
 import { render } from 'hanji';
 import { fromJson } from '../../sqlgenerator';
 import { Select } from '../selector-ui';
+import { Entities } from '../validations/cli';
 import { CasingType } from '../validations/common';
 import { LibSQLCredentials } from '../validations/libsql';
 import type { MysqlCredentials } from '../validations/mysql';
@@ -160,14 +161,15 @@ export const pgPush = async (
 	credentials: PostgresCredentials,
 	tablesFilter: string[],
 	schemasFilter: string[],
+	entities: Entities,
 	force: boolean,
 	casing: CasingType | undefined,
 ) => {
 	const { preparePostgresDB } = await import('../connections');
 	const { pgPushIntrospect } = await import('./pgIntrospect');
 
 	const db = await preparePostgresDB(credentials);
-	const { schema } = await pgPushIntrospect(db, tablesFilter, schemasFilter);
+	const { schema } = await pgPushIntrospect(db, tablesFilter, schemasFilter, entities);
 
 	const { preparePgPush } = await import('./migrate');
 

drizzle-kit/src/cli/commands/utils.ts

@@ -6,7 +6,7 @@ import { object, string } from 'zod';
 import { assertUnreachable } from '../../global';
 import { type Dialect, dialect } from '../../schemaValidator';
 import { prepareFilenames } from '../../serializer';
-import { pullParams, pushParams } from '../validations/cli';
+import { Entities, pullParams, pushParams } from '../validations/cli';
 import {
 	Casing,
 	CasingType,
@@ -391,6 +391,7 @@ export const preparePullConfig = async (
 		tablesFilter: string[];
 		schemasFilter: string[];
 		prefix: Prefix;
+		entities: Entities;
 	}
 > => {
 	const raw = flattenPull(
@@ -450,6 +451,7 @@ export const preparePullConfig = async (
 			tablesFilter,
 			schemasFilter,
 			prefix: config.migrations?.prefix || 'index',
+			entities: config.entities,
 		};
 	}
 
@@ -468,6 +470,7 @@ export const preparePullConfig = async (
 			tablesFilter,
 			schemasFilter,
 			prefix: config.migrations?.prefix || 'index',
+			entities: config.entities,
 		};
 	}
 
@@ -486,6 +489,7 @@ export const preparePullConfig = async (
 			tablesFilter,
 			schemasFilter,
 			prefix: config.migrations?.prefix || 'index',
+			entities: config.entities,
 		};
 	}
 

drizzle-kit/src/cli/schema.ts

@@ -450,6 +450,7 @@ export const pull = command({
 			tablesFilter,
 			schemasFilter,
 			prefix,
+			entities,
 		} = config;
 		mkdirSync(out, { recursive: true });
 
@@ -496,6 +497,7 @@ export const pull = command({
 					tablesFilter,
 					schemasFilter,
 					prefix,
+					entities,
 				);
 			} else if (dialect === 'mysql') {
 				const { introspectMysql } = await import('./commands/introspect');