Skip to content

Commit d0fb8cd

Browse files
RodriguespnRodriguespn
authored
Fix/branch clean up for pr drizzle orm (#30)
* branch clean up for pr * wip [last visited drizzle-kit/src/cli/validations/common.ts * wip [last visited drizzle-kit/src/schemaValidator.ts * drizzle kit cleaning * lint fix * remove unecessary readme.md * replace prepareAndMigrateSqlite for prepareAndMigrateSingleStore when dialect is singlestore * drizzle orm cleaning
1 parent 281c633 commit d0fb8cd

File tree

42 files changed

+62
-1159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+62
-1159
lines changed

‎drizzle-orm/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "drizzle-orm",
3-
"version": "0.34.0",
3+
"version": "0.33.0",
44
"description": "Drizzle ORM package for SQL databases",
55
"type": "module",
66
"scripts": {
@@ -46,7 +46,7 @@
4646
"@aws-sdk/client-rds-data": ">=3",
4747
"@cloudflare/workers-types": ">=3",
4848
"@electric-sql/pglite": ">=0.1.1",
49-
"@libsql/client": ">=0.10.0",
49+
"@libsql/client": "*",
5050
"@neondatabase/serverless": ">=0.1",
5151
"@op-engineering/op-sqlite": ">=2",
5252
"@opentelemetry/api": "^1.4.1",
@@ -161,7 +161,7 @@
161161
"@aws-sdk/client-rds-data": "^3.549.0",
162162
"@cloudflare/workers-types": "^4.20230904.0",
163163
"@electric-sql/pglite": "^0.1.1",
164-
"@libsql/client": "^0.10.0",
164+
"@libsql/client": "^0.5.6",
165165
"@neondatabase/serverless": "^0.9.0",
166166
"@op-engineering/op-sqlite": "^2.0.16",
167167
"@opentelemetry/api": "^1.4.1",

‎drizzle-orm/src/better-sqlite3/driver.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { Database, RunResult } from 'better-sqlite3';
2-
import { entityKind } from '~/entity.ts';
32
import { DefaultLogger } from '~/logger.ts';
43
import {
54
createTableRelationsHelpers,
@@ -12,11 +11,9 @@ import { SQLiteSyncDialect } from '~/sqlite-core/dialect.ts';
1211
import type { DrizzleConfig } from '~/utils.ts';
1312
import { BetterSQLiteSession } from './session.ts';
1413

15-
export class BetterSQLite3Database<TSchema extends Record<string, unknown> = Record<string, never>>
16-
extends BaseSQLiteDatabase<'sync', RunResult, TSchema>
17-
{
18-
static readonly [entityKind]: string = 'BetterSQLite3Database';
19-
}
14+
export type BetterSQLite3Database<
15+
TSchema extends Record<string, unknown> = Record<string, never>,
16+
> = BaseSQLiteDatabase<'sync', RunResult, TSchema>;
2017

2118
export function drizzle<TSchema extends Record<string, unknown> = Record<string, never>>(
2219
client: Database,
@@ -44,5 +41,5 @@ export function drizzle<TSchema extends Record<string, unknown> = Record<string,
4441
}
4542

4643
const session = new BetterSQLiteSession(client, dialect, schema, { logger });
47-
return new BetterSQLite3Database('sync', dialect, session, schema) as BetterSQLite3Database<TSchema>;
44+
return new BaseSQLiteDatabase('sync', dialect, session, schema) as BetterSQLite3Database<TSchema>;
4845
}

‎drizzle-orm/src/bun-sqlite/driver.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/// <reference types="bun-types" />
22

33
import type { Database } from 'bun:sqlite';
4-
import { entityKind } from '~/entity.ts';
54
import { DefaultLogger } from '~/logger.ts';
65
import {
76
createTableRelationsHelpers,
@@ -14,11 +13,9 @@ import { SQLiteSyncDialect } from '~/sqlite-core/dialect.ts';
1413
import type { DrizzleConfig } from '~/utils.ts';
1514
import { SQLiteBunSession } from './session.ts';
1615

17-
export class BunSQLiteDatabase<
16+
export type BunSQLiteDatabase<
1817
TSchema extends Record<string, unknown> = Record<string, never>,
19-
> extends BaseSQLiteDatabase<'sync', void, TSchema> {
20-
static readonly [entityKind]: string = 'BunSQLiteDatabase';
21-
}
18+
> = BaseSQLiteDatabase<'sync', void, TSchema>;
2219

2320
export function drizzle<TSchema extends Record<string, unknown> = Record<string, never>>(
2421
client: Database,
@@ -46,5 +43,5 @@ export function drizzle<TSchema extends Record<string, unknown> = Record<string,
4643
}
4744

4845
const session = new SQLiteBunSession(client, dialect, schema, { logger });
49-
return new BunSQLiteDatabase('sync', dialect, session, schema) as BunSQLiteDatabase<TSchema>;
46+
return new BaseSQLiteDatabase('sync', dialect, session, schema) as BunSQLiteDatabase<TSchema>;
5047
}

‎drizzle-orm/src/expo-sqlite/driver.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { SQLiteDatabase, SQLiteRunResult } from 'expo-sqlite/next';
2-
import { entityKind } from '~/entity.ts';
32
import { DefaultLogger } from '~/logger.ts';
43
import {
54
createTableRelationsHelpers,
@@ -12,11 +11,9 @@ import { SQLiteSyncDialect } from '~/sqlite-core/dialect.ts';
1211
import type { DrizzleConfig } from '~/utils.ts';
1312
import { ExpoSQLiteSession } from './session.ts';
1413

15-
export class ExpoSQLiteDatabase<TSchema extends Record<string, unknown> = Record<string, never>>
16-
extends BaseSQLiteDatabase<'sync', SQLiteRunResult, TSchema>
17-
{
18-
static readonly [entityKind]: string = 'ExpoSQLiteDatabase';
19-
}
14+
export type ExpoSQLiteDatabase<
15+
TSchema extends Record<string, unknown> = Record<string, never>,
16+
> = BaseSQLiteDatabase<'sync', SQLiteRunResult, TSchema>;
2017

2118
export function drizzle<TSchema extends Record<string, unknown> = Record<string, never>>(
2219
client: SQLiteDatabase,
@@ -44,5 +41,5 @@ export function drizzle<TSchema extends Record<string, unknown> = Record<string,
4441
}
4542

4643
const session = new ExpoSQLiteSession(client, dialect, schema, { logger });
47-
return new ExpoSQLiteDatabase('sync', dialect, session, schema) as ExpoSQLiteDatabase<TSchema>;
44+
return new BaseSQLiteDatabase('sync', dialect, session, schema) as ExpoSQLiteDatabase<TSchema>;
4845
}

‎drizzle-orm/src/index.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ export * from './entity.ts';
55
export * from './errors.ts';
66
export * from './expressions.ts';
77
export * from './logger.ts';
8-
export * from './monodriver.ts';
9-
export * from './monomigrator.ts';
108
export * from './operations.ts';
119
export * from './query-promise.ts';
1210
export * from './relations.ts';

‎drizzle-orm/src/libsql/migrator.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { LibSQLDatabase } from './driver.ts';
55

66
export async function migrate<TSchema extends Record<string, unknown>>(
77
db: LibSQLDatabase<TSchema>,
8-
config: MigrationConfig | string,
8+
config: MigrationConfig,
99
) {
1010
const migrations = readMigrationFiles(config);
1111
const migrationsTable = config === undefined
@@ -47,5 +47,5 @@ export async function migrate<TSchema extends Record<string, unknown>>(
4747
}
4848
}
4949

50-
await db.session.migrate(statementToBatch);
50+
await db.session.batch(statementToBatch);
5151
}

‎drizzle-orm/src/libsql/session.ts‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,6 @@ export class LibSQLSession<
7676
return batchResults.map((result, i) => preparedQueries[i]!.mapResult(result, true));
7777
}
7878

79-
async migrate<T extends BatchItem<'sqlite'>[] | readonly BatchItem<'sqlite'>[]>(queries: T) {
80-
const preparedQueries: PreparedQuery[] = [];
81-
const builtQueries: InStatement[] = [];
82-
83-
for (const query of queries) {
84-
const preparedQuery = query._prepare();
85-
const builtQuery = preparedQuery.getQuery();
86-
preparedQueries.push(preparedQuery);
87-
builtQueries.push({ sql: builtQuery.sql, args: builtQuery.params as InArgs });
88-
}
89-
90-
const batchResults = await this.client.migrate(builtQueries);
91-
return batchResults.map((result, i) => preparedQueries[i]!.mapResult(result, true));
92-
}
93-
9479
override async transaction<T>(
9580
transaction: (db: LibSQLTransaction<TFullSchema, TSchema>) => T | Promise<T>,
9681
_config?: SQLiteTransactionConfig,

0 commit comments

Comments
 (0)