Merge pull request #372 from codefori/fix/366_schema_list_sorting

Fix/366_schema_list_sorting

Author: worksofliam

src/connection/sqlJob.ts

@@ -106,7 +106,7 @@ export class OldSQLJob extends SQLJob {
   getStatus(): JobStatus {
     const currentListenerCount = this.responseEmitter.eventNames().length;
 
-    return this.channel && currentListenerCount > 0 ? JobStatus.BUSY : this.status;
+    return this.channel && currentListenerCount > 0 ? JobStatus.BUSY : this.status as JobStatus;
   }
 
   async connect(): Promise<ConnectionResult> {

src/database/schemas.ts

@@ -356,18 +356,12 @@ export default class Schemas {
 
     let query: string;
 
-    if (selects.length > 1) {
-      if (details.sort) {
-        query = `with results as (${selects.join(
-          " UNION ALL "
-        )}) select * from results Order by QSYS2.DELIMIT_NAME(NAME) asc`;
-      } else {
-        query = selects.join(` UNION ALL `);
-      }
-  
+    if (details.sort) {
+      query = `with results as (${selects.join(
+        " UNION ALL "
+      )}) select * from results Order by QSYS2.DELIMIT_NAME(NAME) asc`;
     } else {
-      // TODO: sort single
-      query = selects[0];
+      query = selects.join(` UNION ALL `);
     }
 
     const objects: any[] = await JobManager.runSQL(

src/views/schemaBrowser/index.ts

@@ -508,7 +508,7 @@ export default class schemaBrowser {
         let filterValue = this.filters[element.schema];
         if (filterValue) {
           const validSchemaName = Statement.noQuotes(element.schema);
-          const filteredObjects = await Schemas.getObjects(validSchemaName, AllSQLTypes, { filter: filterValue });
+          const filteredObjects = await Schemas.getObjects(validSchemaName, AllSQLTypes, { filter: filterValue, sort: true });
           items = filteredObjects.map(obj => new SQLObject(obj));
 
         } else {