added support for gel connection without dbCredentials

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

@@ -182,7 +182,7 @@ export const introspectGel = async (
 	casing: Casing,
 	out: string,
 	breakpoints: boolean,
-	credentials: GelCredentials,
+	credentials: GelCredentials | undefined,
 	tablesFilter: string[],
 	schemasFilter: string[],
 	prefix: Prefix,

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

@@ -476,7 +476,7 @@ export const preparePullConfig = async (
 		}
 		| {
 			dialect: 'gel';
-			credentials: GelCredentials;
+			credentials?: GelCredentials;
 		}
 	) & {
 		out: string;

drizzle-kit/src/cli/connections.ts

@@ -1,7 +1,7 @@
 import type { AwsDataApiPgQueryResult, AwsDataApiSessionOptions } from 'drizzle-orm/aws-data-api/pg';
 import type { MigrationConfig } from 'drizzle-orm/migrator';
 import type { PreparedQueryConfig } from 'drizzle-orm/pg-core';
-import { Client } from 'edgedb';
+import { Client, ClientConnectionError } from 'edgedb';
 import fetch from 'node-fetch';
 import ws from 'ws';
 import { assertUnreachable } from '../global';
@@ -419,7 +419,7 @@ export const preparePostgresDB = async (
 };
 
 export const prepareGelDB = async (
-	credentials: GelCredentials,
+	credentials?: GelCredentials,
 ): Promise<
 	DB & {
 		proxy: Proxy;
@@ -429,7 +429,22 @@ export const prepareGelDB = async (
 		const edgedb = await import('edgedb');
 
 		let client: Client;
-		if ('url' in credentials) {
+		if (!credentials) {
+			client = edgedb.createClient();
+			try {
+				await client.querySQL(`select 1;`);
+			} catch (error: any) {
+				if (error instanceof ClientConnectionError) {
+					console.error(
+						`It looks like you forgot to link the Gel project or provide the database credentials.
+To link your project, please refer https://docs.edgedb.com/cli/edgedb_instance/edgedb_instance_link, or add the dbCredentials to your configuration file.`,
+					);
+					process.exit(1);
+				}
+
+				throw error;
+			}
+		} else if ('url' in credentials) {
 			'tlsSecurity' in credentials
 				? client = edgedb.createClient({ dsn: credentials.url, tlsSecurity: credentials.tlsSecurity, concurrency: 1 })
 				: client = edgedb.createClient({ dsn: credentials.url, concurrency: 1 });

drizzle-kit/src/cli/schema.ts

@@ -238,6 +238,8 @@ const optionsDatabaseCredentials = {
 	ssl: string().desc('ssl mode'),
 	// Turso
 	authToken: string('auth-token').desc('Database auth token [Turso]'),
+	// gel
+	tlsSecurity: string('tlsSecurity').desc('tls security mode'),
 	// specific cases
 	driver: optionDriver,
 } as const;
@@ -282,6 +284,7 @@ export const push = command({
 				'extensionsFilters',
 				'tablesFilter',
 				'casing',
+				'tlsSecurity',
 			],
 		);
 
@@ -498,6 +501,7 @@ export const pull = command({
 				'tablesFilter',
 				'schemaFilters',
 				'extensionsFilters',
+				'tlsSecurity',
 			],
 		);
 		return preparePullConfig(opts, from);

drizzle-kit/src/cli/validations/gel.ts

@@ -1,10 +1,10 @@
-import { coerce, literal, object, string, TypeOf, undefined, union } from 'zod';
+import { coerce, literal, object, string, TypeOf, undefined as undefinedType, union } from 'zod';
 import { error } from '../views';
 import { wrapParam } from './common';
 
 export const gelCredentials = union([
 	object({
-		driver: undefined(),
+		driver: undefinedType(),
 		host: string().min(1),
 		port: coerce.number().min(1).optional(),
 		user: string().min(1).optional(),
@@ -21,7 +21,7 @@ export const gelCredentials = union([
 		return o as Omit<typeof o, 'driver'>;
 	}),
 	object({
-		driver: undefined(),
+		driver: undefinedType(),
 		url: string().min(1),
 		tlsSecurity: union([
 			literal('insecure'),
@@ -40,6 +40,11 @@ export const gelCredentials = union([
 		delete o.driver;
 		return o;
 	}),
+	object({
+		driver: undefinedType(),
+	}).transform<undefined>((o) => {
+		return undefined;
+	}),
 ]);
 
 export type GelCredentials = TypeOf<typeof gelCredentials>;
@@ -48,14 +53,14 @@ export const printConfigConnectionIssues = (
 	options: Record<string, unknown>,
 ) => {
 	if ('url' in options) {
-		let text = `Please provide required params for Postgres driver:\n`;
+		let text = `Please provide required params for Gel driver:\n`;
 		console.log(error(text));
 		console.log(wrapParam('url', options.url, false, 'url'));
 		process.exit(1);
 	}
 
 	if ('host' in options || 'database' in options) {
-		let text = `Please provide required params for Postgres driver:\n`;
+		let text = `Please provide required params for Gel driver:\n`;
 		console.log(error(text));
 		console.log(wrapParam('host', options.host));
 		console.log(wrapParam('port', options.port, true));
@@ -68,7 +73,7 @@ export const printConfigConnectionIssues = (
 
 	console.log(
 		error(
-			`Either connection "url" or "host", "database" are required for PostgreSQL database connection`,
+			`Either connection "url" or "host", "database" are required for Gel database connection`,
 		),
 	);
 	process.exit(1);

drizzle-kit/src/index.ts

@@ -231,7 +231,7 @@ export type Config =
 		}
 		| {
 			dialect: Verify<Dialect, 'gel'>;
-			dbCredentials:
+			dbCredentials?:
 				& {
 					tlsSecurity?:
 						| 'insecure'