Merge branch 'alternation-engine' of https://github.com/drizzle-team/drizzle-orm into alternation-engine

Author: Sukairo-02

drizzle-kit/src/dialects/cockroach/drizzle.ts

@@ -247,6 +247,8 @@ export const fromDrizzleSchema = (
 
 	const tableConfigPairs = schema.tables.map((it) => {
 		return { config: getTableConfig(it), table: it };
+	}).filter((it) => {
+		return filter({ type: 'table', schema: it.config.schema ?? 'public', name: it.config.name });
 	});
 
 	for (const policy of schema.policies) {
@@ -594,7 +596,7 @@ export const fromDrizzleSchema = (
 	});
 
 	for (const view of combinedViews) {
-		if (view.isExisting && filter({ type: 'table', schema: view.schema ?? 'public', name: view.name })) continue;
+		if (view.isExisting && !filter({ type: 'table', schema: view.schema ?? 'public', name: view.name })) continue;
 
 		const { name: viewName, schema, query, withNoData, materialized } = view;
 

drizzle-kit/tests/cockroach/pull.test.ts

@@ -542,7 +542,7 @@ test.concurrent('introspect view in other schema', async ({ dbc: db }) => {
 		db,
 		schema,
 		'introspect-view-in-other-schema',
-		['new_schema'],
+		['new_schema', 'public'],
 	);
 
 	expect(statements.length).toBe(0);
@@ -552,11 +552,11 @@ test.concurrent('introspect view in other schema', async ({ dbc: db }) => {
 test.concurrent('introspect materialized view in other schema', async ({ db }) => {
 	const newSchema = cockroachSchema('new_schema');
 	const users = cockroachTable('users', {
-		id: int4('id').primaryKey().notNull(),
-		name: varchar('users'),
+		id: int4().primaryKey(),
+		name: varchar(),
 	});
 
-	const view = newSchema.materializedView('some_view', { id: int4('asd') }).as(
+	const view = newSchema.materializedView('some_view', { id: int4() }).as(
 		sql`SELECT * FROM ${users}`,
 	);
 	const schema = {
@@ -569,7 +569,7 @@ test.concurrent('introspect materialized view in other schema', async ({ db }) =
 		db,
 		schema,
 		'introspect-mat-view-in-other-schema',
-		['new_schema'],
+		['new_schema', 'public'],
 	);
 
 	expect(statements.length).toBe(0);