Skip to content

Commit

Permalink
refactor: Adjust the sql schema and log
Browse files Browse the repository at this point in the history
  • Loading branch information
ci010 committed Oct 4, 2023
1 parent c43d39b commit 7fd9031
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions xmcl-runtime/lib/resources/createResourceContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ export function createResourceContext(root: string, imageStore: ImageStorage, ev
plugins: [new ParseJSONResultsPlugin(), new JSONPlugin()],
log: (e) => {
if (e.level === 'error') {
logger.log(e.query.sql)
logger.log(e.query.parameters)
logger.warn(e.query.sql + '\n[' + e.query.parameters.join(', ') + ']')
}
},
})
Expand Down
6 changes: 3 additions & 3 deletions xmcl-runtime/lib/resources/migrateResources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ async function up(db: Kysely<Database>): Promise<void> {

await db.schema
.createTable('tags')
.addColumn('sha1', 'char(40)', (col) => col.notNull().references('resources.sha1').onDelete('cascade'))
.addColumn('sha1', 'char(40)', (col) => col.notNull()/* .references('resources.sha1').onDelete('cascade') */)
.addColumn('tag', 'varchar', (col) => col.notNull())
.addUniqueConstraint('sha1_uri_unique', ['sha1', 'tag'])
.execute()

await db.schema
.createTable('uris')
.addColumn('sha1', 'char(40)', (col) => col.notNull().references('resources.sha1').onDelete('cascade'))
.addColumn('sha1', 'char(40)', (col) => col.notNull()/* .references('resources.sha1').onDelete('cascade') */)
.addColumn('uri', 'varchar', (col) => col.notNull())
.addUniqueConstraint('sha1_uri_unique', ['sha1', 'uri'])
.execute()

await db.schema
.createTable('icons')
.addColumn('sha1', 'char(40)', (col) => col.notNull().references('resources.sha1').onDelete('cascade'))
.addColumn('sha1', 'char(40)', (col) => col.notNull()/* .references('resources.sha1').onDelete('cascade') */)
.addColumn('icon', 'varchar', (col) => col.notNull())
.addUniqueConstraint('sha1_uri_unique', ['sha1', 'icon'])
.execute()
Expand Down

0 comments on commit 7fd9031

Please sign in to comment.