Add fix for Gel Schemas (#4483)

* Add fix for Gel Schemas

* dprint

* dprint

Author: AndriiSherman

changelogs/drizzle-kit/0.31.1.md

@@ -0,0 +1,18 @@
+### Fixed `drizzle-kit pull` bugs when using Gel extensions.
+
+Because Gel extensions create schema names containing `::` (for example, `ext::auth`), Drizzle previously handled these names incorrectly. Starting with this release, you can use Gel extensions without any problems. Here’s what you should do:
+
+1. Enable extensions schemas in `drizzle.config.ts`
+
+```ts
+import  { defineConfig } from "drizzle-kit";
+
+export default defineConfig({
+  dialect: 'gel',
+  schemaFilter: ['ext::auth', 'public']
+});
+```
+
+2. Run `drizzle-kit pull`
+
+3. Done!

drizzle-kit/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.31.0",
+	"version": "0.31.1",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",

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

@@ -791,8 +791,8 @@ export const relationsToTypeScript = (
 		Object.values(table.foreignKeys).forEach((fk) => {
 			const tableNameFrom = paramNameFor(fk.tableFrom, table.schema);
 			const tableNameTo = paramNameFor(fk.tableTo, fk.schemaTo);
-			const tableFrom = withCasing(tableNameFrom, casing);
-			const tableTo = withCasing(tableNameTo, casing);
+			const tableFrom = withCasing(tableNameFrom.replace(/:+/g, ''), casing);
+			const tableTo = withCasing(tableNameTo.replace(/:+/g, ''), casing);
 			const columnFrom = withCasing(fk.columnsFrom[0], casing);
 			const columnTo = withCasing(fk.columnsTo[0], casing);
 

drizzle-kit/src/cli/schema.ts

@@ -33,7 +33,7 @@ import { error, grey, MigrateProgress } from './views';
 const optionDialect = string('dialect')
 	.enum(...dialects)
 	.desc(
-		`Database dialect: 'postgresql', 'mysql', 'sqlite', 'turso' or 'singlestore'`,
+		`Database dialect: 'gel', 'postgresql', 'mysql', 'sqlite', 'turso' or 'singlestore'`,
 	);
 const optionOut = string().desc("Output folder, 'drizzle' by default");
 const optionConfig = string().desc('Path to drizzle config file');

drizzle-kit/src/introspect-gel.ts

@@ -219,7 +219,7 @@ export const schemaToTypeScript = (schema: GelSchemaInternal, casing: Casing) =>
 
 	const schemas = Object.fromEntries(
 		Object.entries(schema.schemas).map((it) => {
-			return [it[0], withCasing(it[1], casing)];
+			return [it[0], withCasing(it[1].replace('::', ''), casing)];
 		}),
 	);
 
@@ -366,7 +366,7 @@ export const schemaToTypeScript = (schema: GelSchemaInternal, casing: Casing) =>
 	const schemaStatements = Object.entries(schemas)
 		.filter((it) => it[0] !== 'public')
 		.map((it) => {
-			return `export const ${it[1]} = gelSchema("${it[0]}");\n`;
+			return `export const ${it[1].replace('::', '').camelCase()} = gelSchema("${it[0]}");\n`;
 		})
 		.join('');