Skip to content

Commit 79e40ff

Browse files
committed
Merge remote-tracking branch 'origin/main' into miello/feat/react-query
2 parents 4280678 + 466827d commit 79e40ff

14 files changed

Lines changed: 1999 additions & 1202 deletions

File tree

.changeset/good-cities-cut.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@internals/project-config': minor
3+
'@example/erp': minor
4+
---
5+
6+
[[DRIZZ-60] Default API Handler](https://app.plane.so/softnetics/browse/DRIZZ-60/)

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
with:
2222
fetch-depth: 0
2323

24-
- name: Setup GitHub Actions caching for Turbo
25-
uses: dtinth/setup-github-actions-caching-for-turbo@v1
24+
- name: Cache for Turbo
25+
uses: rharkor/caching-for-turbo@v1.5
2626

2727
- name: Setup pnpm
2828
uses: pnpm/action-setup@v4

examples/erp/drizzlify/collections/categories.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { builder } from '../helper'
22

33
export const categoriesCollection = builder.collection('categories', {
44
slug: 'categories',
5-
primaryField: 'id',
5+
identifierColumn: 'id',
66
fields: builder.fields('categories', (fb) => ({
77
id: fb.columns('id', {
88
type: 'text',

examples/erp/drizzlify/collections/posts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { builder } from '../helper'
22

33
export const postsCollection = builder.collection('posts', {
44
slug: 'posts',
5-
primaryField: 'id',
5+
identifierColumn: 'id',
66
fields: builder.fields('posts', (fb) => ({
77
id: fb.columns('id', {
88
type: 'text',

examples/erp/drizzlify/collections/users.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { builder } from '../helper'
22

33
export const usersCollection = builder.collection('users', {
44
slug: 'users',
5-
primaryField: 'id',
5+
identifierColumn: 'id',
66
fields: builder.fields('users', (fb) => ({
77
id: fb.columns('id', {
88
type: 'text',

packages/core/src/__mocks__/test-schema.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { relations } from 'drizzle-orm'
2-
import { integer, pgTable, serial, timestamp, varchar } from 'drizzle-orm/pg-core'
2+
import { integer, pgTable, text, timestamp, varchar } from 'drizzle-orm/pg-core'
33

44
export const postTs = pgTable('post_db', {
5-
idTs: serial('id_db').primaryKey(),
5+
idTs: text('id_db').primaryKey(),
66
nameTs: varchar('name_db', { length: 100 }).notNull(),
77

88
createdAtTs: timestamp('created_at_db').defaultNow().notNull(),
@@ -11,15 +11,15 @@ export const postTs = pgTable('post_db', {
1111

1212
// Posts with relation all table
1313
export const authorTs = pgTable('author_db', {
14-
idTs: serial('id_db').primaryKey(),
14+
idTs: text('id_db').primaryKey(),
1515
nameTs: varchar('name_db', { length: 100 }).notNull(),
1616

1717
createdAtTs: timestamp('created_at_db').defaultNow().notNull(),
1818
updatedAtTs: timestamp('updated_at_db').defaultNow().notNull(),
1919
})
2020

2121
export const postWithAuthorTs = pgTable('post_with_author_db', {
22-
idTs: serial('id_db').primaryKey(),
22+
idTs: text('id_db').primaryKey(),
2323
nameTs: varchar('name_db', { length: 100 }).notNull(),
2424

2525
authorIdTs: integer('author_id_db').references(() => authorTs.idTs),

0 commit comments

Comments
 (0)