mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 10:01:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: load collection with schema (#5541)

Browse Source 
* chore: load collection with schema

* chore: load collection with schema

* chore: test

* chore: test

* chore: test

* chore: test

* fix: test

---------

Co-authored-by: CHENGLEI SHAO <Chareice>
This commit is contained in:
ChengLei Shao 2024-11-01 06:46:55 +08:00 committed by GitHub
parent e818195dd1
commit 056d46c680
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/plugins/@nocobase/plugin-collection-tree/src/server/migrations/20240802141435-collection-tree.ts
View File

@ -47,11 +47,18 @@ export default class extends Migration {
},
],
};
if (treeCollection.options.schema) {
collectionOptions['schema'] = treeCollection.options.schema;
const collectionInstance = this.db.getCollection(treeCollection.name);
const treeCollectionSchema = collectionInstance.collectionSchema();
if (this.app.db.inDialect('postgres') && treeCollectionSchema != this.app.db.options.schema) {
collectionOptions['schema'] = treeCollectionSchema;
}
this.app.db.collection(collectionOptions);
const treeExistsInDb = await this.app.db.getCollection(name).existsInDb({ transaction });
if (!treeExistsInDb) {
await this.app.db.getCollection(name).sync({ transaction } as SyncOptions);
const opts = {
@ -63,9 +70,11 @@ export default class extends Migration {
{ type: 'integer', name: 'parentId' },
],
};
if (treeCollection.options.schema) {
opts['schema'] = treeCollection.options.schema;
if (treeCollectionSchema != this.app.db.options.schema) {
opts['schema'] = treeCollectionSchema;
}
this.app.db.collection(opts);
const chunkSize = 1000;
await this.app.db.getRepository(treeCollection.name).chunk({

15
packages/plugins/@nocobase/plugin-data-source-main/src/server/__tests__/collections.repository.test.ts
View File

@ -7,10 +7,11 @@
* For more information, please refer to: https://www.nocobase.com/agreement.
*/
import Database, { CollectionGroupManager, Collection as DBCollection, HasManyRepository } from '@nocobase/database';
import Database, { Collection as DBCollection, CollectionGroupManager, HasManyRepository } from '@nocobase/database';
import Application from '@nocobase/server';
import { createApp } from '.';
import CollectionManagerPlugin, { CollectionRepository } from '../index';
import { CollectionRepository } from '../index';
import { isPg } from '@nocobase/test';
describe('collections repository', () => {
let db: Database;
@ -26,6 +27,7 @@ describe('collections repository', () => {
});
afterEach(async () => {
vi.unstubAllEnvs();
await app.destroy();
});
@ -380,13 +382,8 @@ describe('collections repository', () => {
expect(afterRepository.load).toBeTruthy();
});
it('should set collection schema from env', async () => {
if (!db.inDialect('postgres')) {
return;
}
const plugin = app.getPlugin<CollectionManagerPlugin>('data-source-main');
plugin.schema = 'testSchema';
it.runIf(isPg())('should set collection schema from env', async () => {
vi.stubEnv('COLLECTION_MANAGER_SCHEMA', 'testSchema');
await Collection.repository.create({
values: {

8
packages/plugins/@nocobase/plugin-data-source-main/src/server/__tests__/fields/belongs-to-many.test.ts
View File

@ -206,18 +206,20 @@ describe('belongsToMany', () => {
context: {},
});
const throughCollection = await Collection.repository.findOne({
const throughCollectionRecord = await Collection.repository.findOne({
filter: {
name: 'post_tags',
},
});
expect(throughCollection.get('sortable')).toEqual(false);
expect(throughCollectionRecord.get('sortable')).toEqual(false);
const collectionManagerSchema = process.env.COLLECTION_MANAGER_SCHEMA;
const mainSchema = process.env.DB_SCHEMA || 'public';
const throughCollection = db.getCollection('post_tags');
if (collectionManagerSchema && mainSchema != collectionManagerSchema && db.inDialect('postgres')) {
expect(throughCollection.get('schema')).toEqual(collectionManagerSchema);
expect(throughCollection.options.schema).toEqual(collectionManagerSchema);
const tableName = db.getCollection('post_tags').model.tableName;

4
packages/plugins/@nocobase/plugin-data-source-main/src/server/models/collection.ts
View File

@ -63,6 +63,10 @@ export class CollectionModel extends MagicAttributeModel {
delete collectionOptions.schema;
}
if (this.db.inDialect('postgres') && !collectionOptions.schema && collectionOptions.from !== 'db2cm') {
collectionOptions.schema = process.env.COLLECTION_MANAGER_SCHEMA || this.db.options.schema || 'public';
}
if (this.db.hasCollection(name)) {
collection = this.db.getCollection(name);

13
packages/plugins/@nocobase/plugin-data-source-main/src/server/server.ts
View File

@ -13,7 +13,6 @@ import { Plugin } from '@nocobase/server';
import { Mutex } from 'async-mutex';
import lodash from 'lodash';
import path from 'path';
import * as process from 'process';
import { CollectionRepository } from '.';
import {
afterCreateForForeignKeyField,
@ -33,8 +32,6 @@ import { FieldIsDependedOnByOtherError } from './errors/field-is-depended-on-by-
import { beforeCreateCheckFieldInMySQL } from './hooks/beforeCreateCheckFieldInMySQL';
export class PluginDataSourceMainServer extends Plugin {
public schema: string;
private loadFilter: Filter = {};
setLoadFilter(filter: Filter) {
@ -55,10 +52,6 @@ export class PluginDataSourceMainServer extends Plugin {
}
async beforeLoad() {
if (this.app.db.inDialect('postgres')) {
this.schema = process.env.COLLECTION_MANAGER_SCHEMA || this.db.options.schema || 'public';
}
this.app.db.registerRepositories({
CollectionRepository,
});
@ -76,12 +69,6 @@ export class PluginDataSourceMainServer extends Plugin {
},
});
this.app.db.on('collections.beforeCreate', async (model) => {
if (this.app.db.inDialect('postgres') && this.schema && model.get('from') != 'db2cm' && !model.get('schema')) {
model.set('schema', this.schema);
}
});
this.app.db.on('collections.beforeCreate', beforeCreateForViewCollection(this.db));
this.app.db.on(

6
packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/__tests__/collection-sync.test.ts
View File

@ -9,7 +9,7 @@
import { BelongsToManyRepository, Database } from '@nocobase/database';
import { AppSupervisor } from '@nocobase/server';
import { MockServer, createMockServer, isPg } from '@nocobase/test';
import { createMockServer, isPg, MockServer } from '@nocobase/test';
import * as process from 'process';
describe.runIf(isPg())('enable plugin', () => {
@ -491,6 +491,8 @@ describe.runIf(isPg())('collection sync', () => {
context: {},
});
const mainCollectionInstance = mainDb.getCollection('mainCollection');
await subApp1.runCommand('restart');
const subAppMainCollectionRecord = await subApp1.db.getRepository('collections').findOne({
@ -504,7 +506,7 @@ describe.runIf(isPg())('collection sync', () => {
const subAppMainCollection = subApp1.db.getCollection('mainCollection');
expect(subAppMainCollection).toBeTruthy();
expect(subAppMainCollection.options.schema).toBe(mainCollection.options.schema || 'public');
expect(subAppMainCollection.options.schema).toBe(mainCollectionInstance.collectionSchema());
await mainApp.db.getRepository('fields').create({
values: {