Remove Subqueries table (#1340)

* Remove Subqueries table

* Fix NOT_SUPPORT function in project

* Remove tests relating to old subqueries table

packages/node-core/src/db/db.module.test.ts

@@ -5,7 +5,6 @@ import {INestApplication} from '@nestjs/common';
 import {Test} from '@nestjs/testing';
 import {Sequelize} from 'sequelize';
 import {NodeConfig} from '../configure/NodeConfig';
-import {SubqueryRepo} from '../entities';
 import {DbModule} from './db.module';
 
 const nodeConfig = new NodeConfig({subquery: 'packages/node-core/test/v1.0.0', subqueryName: 'test'});
@@ -30,12 +29,12 @@ describe('DbModule', () => {
 
   it('can load subquery model', async () => {
     const module = await Test.createTestingModule({
-      imports: [DbModule.forRootWithConfig(nodeConfig), DbModule.forFeature(['Subquery'])],
+      imports: [DbModule.forRootWithConfig(nodeConfig)],
     }).compile();
 
     app = module.createNestApplication();
     await app.init();
-    const subqueryRepo: SubqueryRepo = app.get('Subquery');
-    await expect(subqueryRepo.describe()).resolves.toBeTruthy();
+    // const subqueryRepo: SubqueryRepo = app.get('Subquery');
+    // await expect(subqueryRepo.describe()).resolves.toBeTruthy();
   }, 30000);
 });

packages/node-core/src/db/db.module.ts

@@ -4,7 +4,6 @@
 import {DynamicModule, Global} from '@nestjs/common';
 import {Sequelize, Options as SequelizeOption} from 'sequelize';
 import {NodeConfig} from '../configure/NodeConfig';
-import * as entities from '../entities';
 import {getLogger} from '../logger';
 import {delay} from '../utils/promise';
 
@@ -44,9 +43,6 @@ const sequelizeFactory = (option: SequelizeOption, migrate: boolean) => async ()
   const sequelize = new Sequelize(option);
   const numRetries = 5;
   await establishConnection(sequelize, numRetries);
-  for (const factoryFn of Object.keys(entities).filter((k) => /Factory$/.exec(k))) {
-    entities[factoryFn as keyof typeof entities](sequelize);
-  }
   await sequelize.sync({alter: migrate});
   return sequelize;
 };

packages/node-core/src/index.ts

@@ -6,7 +6,6 @@ export * from './logger';
 export * from './profiler';
 export * from './events';
 export * from './configure';
-export * from './entities';
 export * from './db';
 export * from './meta';
 export * from './utils';

packages/node-core/src/utils/project.ts

@@ -3,40 +3,30 @@
 
 import {QueryTypes, Sequelize} from 'sequelize';
 import {NodeConfig} from '../configure/NodeConfig';
-import {SubqueryRepo} from '../entities/Subquery.entity';
 import {MetadataRepo} from '../indexer/entities/Metadata.entity';
 import {getLogger} from '../logger';
 
 const logger = getLogger('Project-Utils');
 
 export async function getExistingProjectSchema(
   nodeConfig: NodeConfig,
-  sequelize: Sequelize,
-  subqueryRepo: SubqueryRepo
-): Promise<string> {
+  sequelize: Sequelize
+): Promise<string | undefined> {
   const DEFAULT_DB_SCHEMA = 'public';
-  let schema = nodeConfig.localMode ? DEFAULT_DB_SCHEMA : nodeConfig.dbSchema;
+  const schema = nodeConfig.localMode ? DEFAULT_DB_SCHEMA : nodeConfig.dbSchema;
 
   let schemas: string[];
   try {
     const result = await sequelize.query(`SELECT schema_name FROM information_schema.schemata`, {
       type: QueryTypes.SELECT,
     });
-    schemas = result.map((x: any) => x.schema_name) as [string];
+    schemas = result.map((x: any) => x.schema_name);
   } catch (err) {
     logger.error(`Unable to fetch all schemas: ${err}`);
     process.exit(1);
   }
   if (!schemas.includes(schema)) {
-    // fallback to subqueries table
-    const subqueryModel = await subqueryRepo.findOne({
-      where: {name: nodeConfig.subqueryName},
-    });
-    if (subqueryModel) {
-      schema = subqueryModel.dbSchema;
-    } else {
-      schema = undefined;
-    }
+    return undefined;
   }
   return schema;
 }

packages/node/src/configure/SubqueryProject.ts

@@ -35,7 +35,7 @@ export type SubqlProjectDsTemplate = Omit<SubqlProjectDs, 'startBlock'> & {
   name: string;
 };
 
-const NOT_SUPPORT = (name: string) => () => {
+const NOT_SUPPORT = (name: string) => {
   throw new Error(`Manifest specVersion ${name}() is not supported`);
 };
 

packages/node/src/indexer/fetch.module.ts

@@ -25,7 +25,6 @@ import {
 } from './worker/block-dispatcher.service';
 
 @Module({
-  imports: [DbModule.forFeature(['Subquery'])],
   providers: [
     StoreService,
     ApiService,

packages/node/src/indexer/indexer.manager.spec.ts

@@ -10,7 +10,6 @@ import {
   StoreService,
   PoiService,
   MmrService,
-  SubqueryFactory,
   NodeConfig,
 } from '@subql/node-core';
 import { GraphQLSchema } from 'graphql';
@@ -136,7 +135,6 @@ function createIndexerManager(
 
   const poiService = new PoiService(nodeConfig, sequilize);
   const storeService = new StoreService(sequilize, nodeConfig);
-  const subqueryRepo = SubqueryFactory(sequilize);
   const mmrService = new MmrService(nodeConfig, sequilize);
   const sandboxService = new SandboxService(
     apiService,
@@ -154,7 +152,6 @@ function createIndexerManager(
     storeService,
     nodeConfig,
     dynamicDsService,
-    subqueryRepo,
     eventEmitter,
   );
 
@@ -168,7 +165,6 @@ function createIndexerManager(
     sandboxService,
     dsProcessorService,
     dynamicDsService,
-    subqueryRepo,
     projectService,
   );
 }

packages/node/src/indexer/indexer.manager.ts

@@ -1,7 +1,7 @@
 // Copyright 2020-2022 OnFinality Limited authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { ApiPromise } from '@polkadot/api';
 import { RuntimeVersion } from '@polkadot/types/interfaces';
 import { hexToU8a, u8aEq } from '@polkadot/util';
@@ -21,7 +21,6 @@ import {
   PoiBlock,
   StoreService,
   PoiService,
-  SubqueryRepo,
   NodeConfig,
   getLogger,
   profiler,
@@ -65,7 +64,6 @@ export class IndexerManager {
     private sandboxService: SandboxService,
     private dsProcessorService: DsProcessorService,
     private dynamicDsService: DynamicDsService,
-    @Inject('Subquery') protected subqueryRepo: SubqueryRepo,
     private projectService: ProjectService,
   ) {
     logger.info('indexer manager start');

packages/node/src/indexer/indexer.module.ts

@@ -20,7 +20,6 @@ import { SandboxService } from './sandbox.service';
 import { WorkerService } from './worker/worker.service';
 
 @Module({
-  imports: [DbModule.forFeature(['Subquery'])],
   providers: [
     IndexerManager,
     StoreService,