Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Drizzle-ORM support for Generated columns #1471

Merged
merged 42 commits into from
Jun 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
434cfe2
[All] Added new `generated` configuration key to columns and column b…
Angelelz Nov 5, 2023
0b2bb5e
[MySql] Added generatedAlwaysAs method to all column builders and fix…
Angelelz Nov 5, 2023
4787fcb
[Pg] Added `generatedAlwaysAs` and `generatedAsIdentity` methods to a…
Angelelz Nov 5, 2023
862fd2f
[SQLite] Added `generatedAlwaysAs` method to all SQLite column builde…
Angelelz Nov 5, 2023
148f1c0
[All] Fixed type tests
Angelelz Nov 5, 2023
e20b29b
[All] fixed update set types and added type tests
Angelelz Nov 5, 2023
7499703
[All] fixed insert that now bypasses the generated columns and added …
Angelelz Nov 6, 2023
3cffb98
[Pg] Completed implementation of generated as identity
Angelelz Nov 6, 2023
6061a63
[Pg] Deleted config param not needed for generated always as
Angelelz Nov 6, 2023
21b48e1
[All] Deleted old debug coments
Angelelz Nov 19, 2023
6cc364f
Merge branch 'beta' into feat-generated-columns
Angelelz Dec 2, 2023
c201bce
Merge branch 'beta' into feat-generated-columns
AndriiSherman Dec 15, 2023
d0d4011
Merge branch 'beta' into feat-generated-columns
Angelelz Jan 2, 2024
933db61
Merge branch 'beta' into feat-generated-columns
AndriiSherman Mar 25, 2024
dbb1fe0
Add pgSequence, move identity to common, fix type-tests
AndriiSherman Mar 27, 2024
43a5ab9
Move to class for using is with sequences
AndriiSherman Mar 28, 2024
23c870c
Fix test setups for new API
AndriiSherman Mar 28, 2024
25f8d88
Fix import
AndriiSherman Mar 28, 2024
451219c
Merge branch 'main' into generated-internal
AndriiSherman Mar 29, 2024
d5cc3ce
Merge branch 'main' of github.com:drizzle-team/drizzle-orm into gener…
AndriiSherman Mar 29, 2024
a658624
Merge branch 'main' of github.com:drizzle-team/drizzle-orm into feat-…
AndriiSherman Mar 29, 2024
18854f0
expose generated identity
AndriiSherman Apr 1, 2024
169dab4
Merge branch 'feat-generated-columns' into generated-internal
AndriiSherman Apr 1, 2024
0c4b492
Merge branch 'main' of github.com:drizzle-team/drizzle-orm into feat-…
AndriiSherman Apr 3, 2024
5f598e2
Fix shouldDisableInsert part
AndriiSherman Apr 3, 2024
e78f396
Merge branch 'main' of github.com:drizzle-team/drizzle-orm into gener…
AndriiSherman Jun 7, 2024
0d48b64
Fixed new typed configs
AndriiSherman Jun 7, 2024
3739dfc
Add isPgSequence
AndriiSherman Jun 11, 2024
a020011
Merge branch 'main' of github.com:drizzle-team/drizzle-orm into gener…
AndriiSherman Jun 11, 2024
857ba54
Update int.common types
AndriiSherman Jun 11, 2024
f4b4750
Update isPgSequence
AndriiSherman Jun 12, 2024
4ed01aa
Fix imports in sequences
AndriiSherman Jun 12, 2024
0055471
Update PgSequence creation
AndriiSherman Jun 12, 2024
0a6885d
Allow numbers ans strings for sequences properties
AndriiSherman Jun 13, 2024
af7ce99
Add callback option to mysql and sqlite generated
AndriiSherman Jun 17, 2024
81cb794
Update identity behavior
AndriiSherman Jun 22, 2024
7721c7c
Remove seq as an option for identity column
AndriiSherman Jun 22, 2024
b3c3f7c
identity columns has default by default
AndriiSherman Jun 24, 2024
85c8008
Make not null for identity
AndriiSherman Jun 24, 2024
0fdaa9e
Update compatibilityVersion to 8
AndriiSherman Jun 25, 2024
e7cf338
Get version 7 back
AndriiSherman Jun 25, 2024
6b0a11e
Merge branch 'generated-internal' into feat-generated-columns
AndriiSherman Jun 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' of github.com:drizzle-team/drizzle-orm into gener…
…ated-internal
AndriiSherman committed Jun 7, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit e78f396b2ea3eac7a47e2b210e0afb6004d57a61
2 changes: 1 addition & 1 deletion drizzle-orm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "drizzle-orm",
"version": "0.31.1",
"version": "0.32.0",
"description": "Drizzle ORM package for SQL databases",
"type": "module",
"scripts": {
2 changes: 1 addition & 1 deletion drizzle-orm/src/column-builder.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { entityKind } from '~/entity.ts';
import type { Column } from './column.ts';
import type { MySqlColumn } from './mysql-core/index.ts';
import type { PgColumn, PgSequenceOptions } from './pg-core/index.ts';
import type { ExtraConfigColumn, PgColumn, PgSequenceOptions } from './pg-core/index.ts';
import type { SQL } from './sql/sql.ts';
import type { SQLiteColumn } from './sqlite-core/index.ts';
import type { Simplify } from './utils.ts';
3 changes: 2 additions & 1 deletion drizzle-orm/src/mysql-core/dialect.ts
Original file line number Diff line number Diff line change
@@ -16,7 +16,8 @@ import {
type TableRelationalConfig,
type TablesRelationalConfig,
} from '~/relations.ts';
import { Param, type QueryWithTypings, SQL, sql, type SQLChunk, View } from '~/sql/sql.ts';
import { Param, SQL, sql, View } from '~/sql/sql.ts';
import type { Name, QueryWithTypings, SQLChunk } from '~/sql/sql.ts';
import { Subquery } from '~/subquery.ts';
import { getTableName, Table } from '~/table.ts';
import { orderSelectedFields, type UpdateSet } from '~/utils.ts';
You are viewing a condensed version of this merge commit. You can view the full changes here.