self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Fixed types

Browse Source
This commit is contained in:
Laurent Cozic
2023-10-21 16:07:44 +01:00
parent 63aea35e36
commit 8d20aa0bb8
7 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/lib/JoplinDatabase.ts
View File

@@ -127,6 +127,7 @@ INSERT INTO version (version) VALUES (1);
const migrations: Migration[] = [
migration42,
migration43,
// migration44,
];
export interface TableField {

2
packages/lib/models/NoteResource.ts
View File

@@ -1,5 +1,5 @@
import BaseModel from '../BaseModel';
import { SqlQuery } from '../database';
import { SqlQuery } from '../services/database/types';
import BaseItem from './BaseItem';
// - If is_associated = 1, note_resources indicates which note_id is currently associated with the given resource_id

6
packages/lib/models/Resource.ts
View File

@@ -442,4 +442,10 @@ export default class Resource extends BaseItem {
}, { changeSource: ItemChange.SOURCE_SYNC });
}
// public static async save(o: ResourceEntity, options: SaveOptions = null): Promise<ResourceEntity> {
// const resource:ResourceEntity = await super.save(o, options);
// if (resource.updated_time) resource.bl
// return resource;
// }
}

2
packages/lib/models/utils/types.ts
View File

@@ -1,4 +1,4 @@
import { SqlQuery } from '../../database';
import { SqlQuery } from '../../services/database/types';
export enum PaginationOrderDir {
ASC = 'ASC',

6
packages/lib/services/database/types.ts
View File

@@ -150,6 +150,7 @@ export interface FolderEntity {
'title'?: string;
'updated_time'?: number;
'user_created_time'?: number;
'user_data'?: string;
'user_updated_time'?: number;
'type_'?: number;
}
@@ -270,6 +271,7 @@ export interface ResourceEntity {
'title'?: string;
'updated_time'?: number;
'user_created_time'?: number;
'user_data'?: string;
'user_updated_time'?: number;
'type_'?: number;
}
@@ -330,6 +332,7 @@ export interface TagEntity {
'title'?: string;
'updated_time'?: number;
'user_created_time'?: number;
'user_data'?: string;
'user_updated_time'?: number;
'type_'?: number;
}
@@ -363,6 +366,7 @@ export const databaseSchema: DatabaseTables = {
title: { type: 'string' },
updated_time: { type: 'number' },
user_created_time: { type: 'number' },
user_data: { type: 'string' },
user_updated_time: { type: 'number' },
type_: { type: 'number' },
},
@@ -376,6 +380,7 @@ export const databaseSchema: DatabaseTables = {
title: { type: 'string' },
updated_time: { type: 'number' },
user_created_time: { type: 'number' },
user_data: { type: 'string' },
user_updated_time: { type: 'number' },
type_: { type: 'number' },
},
@@ -477,6 +482,7 @@ export const databaseSchema: DatabaseTables = {
title: { type: 'string' },
updated_time: { type: 'number' },
user_created_time: { type: 'number' },
user_data: { type: 'string' },
user_updated_time: { type: 'number' },
type_: { type: 'number' },
},

2
packages/lib/services/plugins/api/noteListType.ts
View File

@@ -3,7 +3,7 @@
import { Size } from './types';
// AUTO-GENERATED by generate-database-type
type ListRendererDatabaseDependency = 'folder.created_time' | 'folder.encryption_applied' | 'folder.encryption_cipher_text' | 'folder.icon' | 'folder.id' | 'folder.is_shared' | 'folder.master_key_id' | 'folder.parent_id' | 'folder.share_id' | 'folder.title' | 'folder.updated_time' | 'folder.user_created_time' | 'folder.user_updated_time' | 'folder.type_' | 'note.altitude' | 'note.application_data' | 'note.author' | 'note.body' | 'note.conflict_original_id' | 'note.created_time' | 'note.encryption_applied' | 'note.encryption_cipher_text' | 'note.id' | 'note.is_conflict' | 'note.is_shared' | 'note.is_todo' | 'note.latitude' | 'note.longitude' | 'note.markup_language' | 'note.master_key_id' | 'note.order' | 'note.parent_id' | 'note.share_id' | 'note.source' | 'note.source_application' | 'note.source_url' | 'note.title' | 'note.todo_completed' | 'note.todo_due' | 'note.updated_time' | 'note.user_created_time' | 'note.user_data' | 'note.user_updated_time' | 'note.type_';
type ListRendererDatabaseDependency = 'folder.created_time' | 'folder.encryption_applied' | 'folder.encryption_cipher_text' | 'folder.icon' | 'folder.id' | 'folder.is_shared' | 'folder.master_key_id' | 'folder.parent_id' | 'folder.share_id' | 'folder.title' | 'folder.updated_time' | 'folder.user_created_time' | 'folder.user_data' | 'folder.user_updated_time' | 'folder.type_' | 'note.altitude' | 'note.application_data' | 'note.author' | 'note.body' | 'note.conflict_original_id' | 'note.created_time' | 'note.encryption_applied' | 'note.encryption_cipher_text' | 'note.id' | 'note.is_conflict' | 'note.is_shared' | 'note.is_todo' | 'note.latitude' | 'note.longitude' | 'note.markup_language' | 'note.master_key_id' | 'note.order' | 'note.parent_id' | 'note.share_id' | 'note.source' | 'note.source_application' | 'note.source_url' | 'note.title' | 'note.todo_completed' | 'note.todo_due' | 'note.updated_time' | 'note.user_created_time' | 'note.user_data' | 'note.user_updated_time' | 'note.type_';
// AUTO-GENERATED by generate-database-type
export enum ItemFlow {

2
packages/lib/services/synchronizer/tools.ts
View File

@@ -1,8 +1,8 @@
import { SqlQuery } from '../../database';
import JoplinDatabase from '../../JoplinDatabase';
import BaseItem from '../../models/BaseItem';
import Setting from '../../models/Setting';
import SyncTargetRegistry from '../../SyncTargetRegistry';
import { SqlQuery } from '../database/types';
async function clearSyncContext() {
const syncTargetIds = SyncTargetRegistry.allIds();