Browse Source

fix import cycle

pull/2672/head
Bernd Storath 3 weeks ago
parent
commit
bbf0707fd6
  1. 4
      src/server/database/repositories/client/schema.ts
  2. 2
      src/server/database/repositories/hooks/schema.ts
  3. 3
      src/server/database/repositories/interface/schema.ts
  4. 2
      src/server/database/repositories/oneTimeLink/schema.ts
  5. 2
      src/server/database/repositories/user/schema.ts
  6. 2
      src/server/database/repositories/userConfig/schema.ts
  7. 1
      src/server/database/schema.ts

4
src/server/database/repositories/client/schema.ts

@ -1,7 +1,9 @@
import { sql, relations } from 'drizzle-orm';
import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { oneTimeLink, user, wgInterface } from '#db/schema';
import { wgInterface } from '#db/repositories/interface/schema';
import { oneTimeLink } from '#db/repositories/oneTimeLink/schema';
import { user } from '#db/repositories/user/schema';
/** null means use value from userConfig */

2
src/server/database/repositories/hooks/schema.ts

@ -1,7 +1,7 @@
import { sql } from 'drizzle-orm';
import { sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { wgInterface } from '#db/schema';
import { wgInterface } from '#db/repositories/interface/schema';
export const hooks = sqliteTable('hooks_table', {
/** same as `wgInterface.name` */

3
src/server/database/repositories/interface/schema.ts

@ -1,7 +1,8 @@
import { sql, relations } from 'drizzle-orm';
import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { userConfig, hooks } from '#db/schema';
import { hooks } from '#db/repositories/hooks/schema';
import { userConfig } from '#db/repositories/userConfig/schema';
// maybe support multiple interfaces in the future
export const wgInterface = sqliteTable('interfaces_table', {

2
src/server/database/repositories/oneTimeLink/schema.ts

@ -1,7 +1,7 @@
import { sql, relations } from 'drizzle-orm';
import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { client } from '#db/schema';
import { client } from '#db/repositories/client/schema';
export const oneTimeLink = sqliteTable('one_time_links_table', {
/** same as `client.id` */

2
src/server/database/repositories/user/schema.ts

@ -1,7 +1,7 @@
import { sql, relations } from 'drizzle-orm';
import { int, sqliteTable, text, uniqueIndex } from 'drizzle-orm/sqlite-core';
import { client } from '#db/schema';
import { client } from '#db/repositories/client/schema';
import type { Role } from '#shared/utils/permissions';
import type { OAUTH_PROVIDER } from '#server/utils/oauth';

2
src/server/database/repositories/userConfig/schema.ts

@ -1,7 +1,7 @@
import { sql } from 'drizzle-orm';
import { int, sqliteTable, text } from 'drizzle-orm/sqlite-core';
import { wgInterface } from '#db/schema';
import { wgInterface } from '../interface/schema';
// default* means clients store it themselves
export const userConfig = sqliteTable('user_configs_table', {

1
src/server/database/schema.ts

@ -1,4 +1,3 @@
// Make sure to not use any Path Aliases in these files
export * from '#db/repositories/client/schema';
export * from '#db/repositories/general/schema';
export * from '#db/repositories/hooks/schema';

Loading…
Cancel
Save