@memberjunction/server 0.9.110 → 0.9.112

package/dist/generated/generated.js

@@ -182,28 +182,33 @@ let CompanyResolver = class CompanyResolver extends server_1.ResolverBase {
     }
     async Company(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Companies', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwCompanies WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Companies', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwCompanies] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Companies', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Companies', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllCompanies({ dataSource, userPayload }, pubSub) {
+    async AllCompanies({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Companies', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwCompanies' + this.getRowLevelSecurityWhereClause('Companies', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwCompanies]' + this.getRowLevelSecurityWhereClause('Companies', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Companies', await dataSource.query(sSQL));
+        return result;
     }
     async EmployeesArray(company_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employees', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEmployees] WHERE CompanyID=${company_.ID} ` + this.getRowLevelSecurityWhereClause('Employees', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEmployees] WHERE [CompanyID]=${company_.ID} ` + this.getRowLevelSecurityWhereClause('Employees', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Employees', await dataSource.query(sSQL));
+        return result;
     }
     async CompanyIntegrationsArray(company_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integrations', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrations] WHERE CompanyName=${company_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrations] WHERE [CompanyName]=${company_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Company Integrations', await dataSource.query(sSQL));
+        return result;
     }
     async WorkflowsArray(company_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workflows', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwWorkflows] WHERE CompanyName=${company_.ID} ` + this.getRowLevelSecurityWhereClause('Workflows', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwWorkflows] WHERE [CompanyName]=${company_.ID} ` + this.getRowLevelSecurityWhereClause('Workflows', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Workflows', await dataSource.query(sSQL));
+        return result;
     }
     async CreateCompany(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -221,11 +226,9 @@ let CompanyResolver = class CompanyResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateCompany(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -253,9 +256,10 @@ let CompanyResolver = class CompanyResolver extends server_1.ResolverBase {
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Companies', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -313,7 +317,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], CompanyResolver.prototype, "AllCompanies", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [Employee_]),
@@ -361,7 +365,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], CompanyResolver.prototype, "UpdateCompany", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => Company_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -603,33 +607,39 @@ let EmployeeResolver = class EmployeeResolver extends server_1.ResolverBase {
     }
     async Employee(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employees', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEmployees WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Employees', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEmployees] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Employees', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Employees', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllEmployees({ dataSource, userPayload }, pubSub) {
+    async AllEmployees({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employees', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwEmployees' + this.getRowLevelSecurityWhereClause('Employees', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwEmployees]' + this.getRowLevelSecurityWhereClause('Employees', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Employees', await dataSource.query(sSQL));
+        return result;
     }
     async EmployeesArray(employee_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employees', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEmployees] WHERE SupervisorID=${employee_.ID} ` + this.getRowLevelSecurityWhereClause('Employees', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEmployees] WHERE [SupervisorID]=${employee_.ID} ` + this.getRowLevelSecurityWhereClause('Employees', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Employees', await dataSource.query(sSQL));
+        return result;
     }
     async EmployeeCompanyIntegrationsArray(employee_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employee Company Integrations', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEmployeeCompanyIntegrations] WHERE EmployeeID=${employee_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEmployeeCompanyIntegrations] WHERE [EmployeeID]=${employee_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Employee Company Integrations', await dataSource.query(sSQL));
+        return result;
     }
     async EmployeeRolesArray(employee_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employee Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEmployeeRoles] WHERE EmployeeID=${employee_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEmployeeRoles] WHERE [EmployeeID]=${employee_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Employee Roles', await dataSource.query(sSQL));
+        return result;
     }
     async EmployeeSkillsArray(employee_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employee Skills', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEmployeeSkills] WHERE EmployeeID=${employee_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEmployeeSkills] WHERE [EmployeeID]=${employee_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Employee Skills', await dataSource.query(sSQL));
+        return result;
     }
     async CreateEmployee(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -647,11 +657,9 @@ let EmployeeResolver = class EmployeeResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateEmployee(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -679,9 +687,10 @@ let EmployeeResolver = class EmployeeResolver extends server_1.ResolverBase {
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Employees', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -739,7 +748,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], EmployeeResolver.prototype, "AllEmployees", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [Employee_]),
@@ -796,7 +805,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], EmployeeResolver.prototype, "UpdateEmployee", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => Employee_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -943,8 +952,9 @@ let UserFavoriteResolverBase = class UserFavoriteResolverBase extends server_1.R
     }
     async UserFavorite(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Favorites', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUserFavorites WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('User Favorites', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUserFavorites] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('User Favorites', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('User Favorites', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateUserFavorite(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -962,11 +972,9 @@ let UserFavoriteResolverBase = class UserFavoriteResolverBase extends server_1.R
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateUserFavorite(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -993,9 +1001,10 @@ let UserFavoriteResolverBase = class UserFavoriteResolverBase extends server_1.R
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('User Favorites', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -1066,7 +1075,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], UserFavoriteResolverBase.prototype, "UpdateUserFavorite", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => UserFavorite_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -1188,8 +1197,9 @@ let EmployeeCompanyIntegrationResolver = class EmployeeCompanyIntegrationResolve
     }
     async EmployeeCompanyIntegration(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employee Company Integrations', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEmployeeCompanyIntegrations WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Employee Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEmployeeCompanyIntegrations] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Employee Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Employee Company Integrations', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async UpdateEmployeeCompanyIntegration(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -1360,8 +1370,9 @@ let EmployeeRoleResolver = class EmployeeRoleResolver extends server_1.ResolverB
     }
     async EmployeeRole(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employee Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEmployeeRoles WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Employee Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEmployeeRoles] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Employee Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Employee Roles', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async UpdateEmployeeRole(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -1533,8 +1544,9 @@ let EmployeeSkillResolver = class EmployeeSkillResolver extends server_1.Resolve
     }
     async EmployeeSkill(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employee Skills', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEmployeeSkills WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Employee Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEmployeeSkills] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Employee Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Employee Skills', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async UpdateEmployeeSkill(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -1737,33 +1749,39 @@ let RoleResolver = class RoleResolver extends server_1.ResolverBase {
     }
     async Role(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwRoles WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwRoles] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Roles', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllRoles({ dataSource, userPayload }, pubSub) {
+    async AllRoles({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Roles', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwRoles' + this.getRowLevelSecurityWhereClause('Roles', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwRoles]' + this.getRowLevelSecurityWhereClause('Roles', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Roles', await dataSource.query(sSQL));
+        return result;
     }
     async EmployeeRolesArray(role_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employee Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEmployeeRoles] WHERE RoleID=${role_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEmployeeRoles] WHERE [RoleID]=${role_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Employee Roles', await dataSource.query(sSQL));
+        return result;
     }
     async EntityPermissionsArray(role_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Permissions', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityPermissions] WHERE RoleName=${role_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityPermissions] WHERE [RoleName]=${role_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Permissions', await dataSource.query(sSQL));
+        return result;
     }
     async UserRolesArray(role_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserRoles] WHERE RoleName=${role_.ID} ` + this.getRowLevelSecurityWhereClause('User Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserRoles] WHERE [RoleName]=${role_.ID} ` + this.getRowLevelSecurityWhereClause('User Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Roles', await dataSource.query(sSQL));
+        return result;
     }
     async AuthorizationRolesArray(role_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Authorization Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAuthorizationRoles] WHERE RoleName=${role_.ID} ` + this.getRowLevelSecurityWhereClause('Authorization Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAuthorizationRoles] WHERE [RoleName]=${role_.ID} ` + this.getRowLevelSecurityWhereClause('Authorization Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Authorization Roles', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateRole(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -1829,7 +1847,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], RoleResolver.prototype, "AllRoles", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [EmployeeRole_]),
@@ -1969,23 +1987,27 @@ let SkillResolver = class SkillResolver extends server_1.ResolverBase {
     }
     async Skill(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Skills', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwSkills WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwSkills] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Skills', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllSkills({ dataSource, userPayload }, pubSub) {
+    async AllSkills({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Skills', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwSkills' + this.getRowLevelSecurityWhereClause('Skills', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwSkills]' + this.getRowLevelSecurityWhereClause('Skills', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Skills', await dataSource.query(sSQL));
+        return result;
     }
     async EmployeeSkillsArray(skill_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employee Skills', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEmployeeSkills] WHERE SkillID=${skill_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEmployeeSkills] WHERE [SkillID]=${skill_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Employee Skills', await dataSource.query(sSQL));
+        return result;
     }
     async SkillsArray(skill_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Skills', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwSkills] WHERE ParentID=${skill_.ID} ` + this.getRowLevelSecurityWhereClause('Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwSkills] WHERE [ParentID]=${skill_.ID} ` + this.getRowLevelSecurityWhereClause('Skills', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Skills', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -2030,7 +2052,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], SkillResolver.prototype, "AllSkills", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [EmployeeSkill_]),
@@ -2166,13 +2188,15 @@ let IntegrationURLFormatResolver = class IntegrationURLFormatResolver extends se
     }
     async IntegrationURLFormat(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Integration URL Formats', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwIntegrationURLFormats WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Integration URL Formats', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwIntegrationURLFormats] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Integration URL Formats', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Integration URL Formats', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllIntegrationURLFormats({ dataSource, userPayload }, pubSub) {
+    async AllIntegrationURLFormats({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Integration URL Formats', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwIntegrationURLFormats' + this.getRowLevelSecurityWhereClause('Integration URL Formats', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwIntegrationURLFormats]' + this.getRowLevelSecurityWhereClause('Integration URL Formats', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Integration URL Formats', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateIntegrationURLFormat(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -2238,7 +2262,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], IntegrationURLFormatResolver.prototype, "AllIntegrationURLFormats", null);
 __decorate([
     (0, server_1.Mutation)(() => IntegrationURLFormat_),
@@ -2399,23 +2423,27 @@ let IntegrationResolver = class IntegrationResolver extends server_1.ResolverBas
     }
     async Integration(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Integrations', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwIntegrations WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwIntegrations] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Integrations', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllIntegrations({ dataSource, userPayload }, pubSub) {
+    async AllIntegrations({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Integrations', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwIntegrations' + this.getRowLevelSecurityWhereClause('Integrations', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwIntegrations]' + this.getRowLevelSecurityWhereClause('Integrations', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Integrations', await dataSource.query(sSQL));
+        return result;
     }
     async IntegrationURLFormatsArray(integration_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Integration URL Formats', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwIntegrationURLFormats] WHERE IntegrationID=${integration_.ID} ` + this.getRowLevelSecurityWhereClause('Integration URL Formats', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwIntegrationURLFormats] WHERE [IntegrationID]=${integration_.ID} ` + this.getRowLevelSecurityWhereClause('Integration URL Formats', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Integration URL Formats', await dataSource.query(sSQL));
+        return result;
     }
     async CompanyIntegrationsArray(integration_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integrations', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrations] WHERE IntegrationName=${integration_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrations] WHERE [IntegrationName]=${integration_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Company Integrations', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateIntegration(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -2481,7 +2509,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], IntegrationResolver.prototype, "AllIntegrations", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [IntegrationURLFormat_]),
@@ -2755,28 +2783,33 @@ let CompanyIntegrationResolver = class CompanyIntegrationResolver extends server
     }
     async CompanyIntegration(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integrations', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwCompanyIntegrations WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrations] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Company Integrations', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ListsArray(companyintegration_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Lists', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwLists] WHERE CompanyIntegrationID=${companyintegration_.ID} ` + this.getRowLevelSecurityWhereClause('Lists', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwLists] WHERE [CompanyIntegrationID]=${companyintegration_.ID} ` + this.getRowLevelSecurityWhereClause('Lists', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Lists', await dataSource.query(sSQL));
+        return result;
     }
     async EmployeeCompanyIntegrationsArray(companyintegration_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Employee Company Integrations', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEmployeeCompanyIntegrations] WHERE CompanyIntegrationID=${companyintegration_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEmployeeCompanyIntegrations] WHERE [CompanyIntegrationID]=${companyintegration_.ID} ` + this.getRowLevelSecurityWhereClause('Employee Company Integrations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Employee Company Integrations', await dataSource.query(sSQL));
+        return result;
     }
     async CompanyIntegrationRunsArray(companyintegration_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Runs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRuns] WHERE CompanyIntegrationID=${companyintegration_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRuns] WHERE [CompanyIntegrationID]=${companyintegration_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Company Integration Runs', await dataSource.query(sSQL));
+        return result;
     }
     async CompanyIntegrationRecordMapsArray(companyintegration_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Record Maps', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRecordMaps] WHERE CompanyIntegrationID=${companyintegration_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Record Maps', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRecordMaps] WHERE [CompanyIntegrationID]=${companyintegration_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Record Maps', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Company Integration Record Maps', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateCompanyIntegration(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -3071,7 +3104,7 @@ __decorate([
 ], EntityField_.prototype, "EntityCodeName", void 0);
 __decorate([
     (0, server_1.Field)({ nullable: true }),
-    (0, class_validator_1.MaxLength)(1022),
+    (0, class_validator_1.MaxLength)(8000),
     __metadata("design:type", String)
 ], EntityField_.prototype, "EntityClassName", void 0);
 __decorate([
@@ -3101,7 +3134,7 @@ __decorate([
 ], EntityField_.prototype, "RelatedEntityCodeName", void 0);
 __decorate([
     (0, server_1.Field)({ nullable: true }),
-    (0, class_validator_1.MaxLength)(1022),
+    (0, class_validator_1.MaxLength)(8000),
     __metadata("design:type", String)
 ], EntityField_.prototype, "RelatedEntityClassName", void 0);
 __decorate([
@@ -3351,18 +3384,21 @@ let EntityFieldResolver = class EntityFieldResolver extends server_1.ResolverBas
     }
     async EntityField(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Fields', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEntityFields WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Entity Fields', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEntityFields] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Entity Fields', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Entity Fields', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllEntityFields({ dataSource, userPayload }, pubSub) {
+    async AllEntityFields({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Fields', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwEntityFields' + this.getRowLevelSecurityWhereClause('Entity Fields', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwEntityFields]' + this.getRowLevelSecurityWhereClause('Entity Fields', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Fields', await dataSource.query(sSQL));
+        return result;
     }
     async EntityFieldValuesArray(entityfield_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Field Values', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityFieldValues] WHERE EntityFieldID=${entityfield_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Field Values', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityFieldValues] WHERE [EntityFieldID]=${entityfield_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Field Values', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Field Values', await dataSource.query(sSQL));
+        return result;
     }
     async CreateEntityField(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -3380,11 +3416,9 @@ let EntityFieldResolver = class EntityFieldResolver extends server_1.ResolverBas
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateEntityField(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -3411,9 +3445,10 @@ let EntityFieldResolver = class EntityFieldResolver extends server_1.ResolverBas
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Entity Fields', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -3471,7 +3506,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], EntityFieldResolver.prototype, "AllEntityFields", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [EntityFieldValue_]),
@@ -3501,7 +3536,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], EntityFieldResolver.prototype, "UpdateEntityField", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => EntityField_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -3697,12 +3732,12 @@ __decorate([
 ], Entity_.prototype, "CodeName", void 0);
 __decorate([
     (0, server_1.Field)({ nullable: true }),
-    (0, class_validator_1.MaxLength)(1022),
+    (0, class_validator_1.MaxLength)(8000),
     __metadata("design:type", String)
 ], Entity_.prototype, "ClassName", void 0);
 __decorate([
     (0, server_1.Field)({ nullable: true }),
-    (0, class_validator_1.MaxLength)(1022),
+    (0, class_validator_1.MaxLength)(8000),
     __metadata("design:type", String)
 ], Entity_.prototype, "BaseTableCodeName", void 0);
 __decorate([
@@ -3806,6 +3841,10 @@ Entity_ = Entity_1 = __decorate([
 exports.Entity_ = Entity_;
 let CreateEntityInput = class CreateEntityInput {
 };
+__decorate([
+    (0, server_1.Field)(() => server_1.Int),
+    __metadata("design:type", Number)
+], CreateEntityInput.prototype, "ID", void 0);
 __decorate([
     (0, server_1.Field)(() => server_1.Int, { nullable: true }),
     __metadata("design:type", Number)
@@ -4147,113 +4186,135 @@ let EntityResolverBase = class EntityResolverBase extends server_1.ResolverBase
     }
     async Entity(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entities', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEntities WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEntities] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Entities', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllEntities({ dataSource, userPayload }, pubSub) {
+    async AllEntities({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entities', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwEntities' + this.getRowLevelSecurityWhereClause('Entities', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwEntities]' + this.getRowLevelSecurityWhereClause('Entities', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entities', await dataSource.query(sSQL));
+        return result;
     }
     async EntityFieldsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Fields', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityFields] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Fields', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityFields] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Fields', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Fields', await dataSource.query(sSQL));
+        return result;
     }
     async EntityPermissionsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Permissions', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityPermissions] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityPermissions] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Permissions', await dataSource.query(sSQL));
+        return result;
     }
     async EntityRelationshipsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Relationships', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityRelationships] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Relationships', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityRelationships] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Relationships', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Relationships', await dataSource.query(sSQL));
+        return result;
     }
     async EntityAIActionsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity AI Actions', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityAIActions] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityAIActions] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity AI Actions', await dataSource.query(sSQL));
+        return result;
     }
     async UserRecordLogsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Record Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserRecordLogs] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('User Record Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserRecordLogs] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('User Record Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Record Logs', await dataSource.query(sSQL));
+        return result;
     }
     async IntegrationURLFormatsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Integration URL Formats', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwIntegrationURLFormats] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Integration URL Formats', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwIntegrationURLFormats] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Integration URL Formats', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Integration URL Formats', await dataSource.query(sSQL));
+        return result;
     }
     async EntitiesArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entities', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntities] WHERE ParentID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntities] WHERE [ParentID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entities', await dataSource.query(sSQL));
+        return result;
     }
     async UserFavoritesArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Favorites', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserFavorites] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('User Favorites', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserFavorites] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('User Favorites', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Favorites', await dataSource.query(sSQL));
+        return result;
     }
     async CompanyIntegrationRunDetailsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Run Details', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRunDetails] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRunDetails] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Company Integration Run Details', await dataSource.query(sSQL));
+        return result;
     }
     async ApplicationEntitiesArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Application Entities', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwApplicationEntities] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwApplicationEntities] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Application Entities', await dataSource.query(sSQL));
+        return result;
     }
     async UserApplicationEntitiesArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Application Entities', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserApplicationEntities] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('User Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserApplicationEntities] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('User Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Application Entities', await dataSource.query(sSQL));
+        return result;
     }
     async ListsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Lists', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwLists] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Lists', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwLists] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Lists', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Lists', await dataSource.query(sSQL));
+        return result;
     }
     async UserViewsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Views', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserViews] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('User Views', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserViews] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('User Views', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Views', await dataSource.query(sSQL));
+        return result;
     }
     async RecordChangesArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Record Changes', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwRecordChanges] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Record Changes', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwRecordChanges] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Record Changes', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Record Changes', await dataSource.query(sSQL));
+        return result;
     }
     async AuditLogsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Audit Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAuditLogs] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAuditLogs] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Audit Logs', await dataSource.query(sSQL));
+        return result;
     }
     async ResourceTypesArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Resource Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwResourceTypes] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Resource Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwResourceTypes] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Resource Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Resource Types', await dataSource.query(sSQL));
+        return result;
     }
     async TaggedItemsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Tagged Items', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwTaggedItems] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Tagged Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwTaggedItems] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Tagged Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Tagged Items', await dataSource.query(sSQL));
+        return result;
     }
     async DatasetItemsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Dataset Items', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwDatasetItems] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Dataset Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwDatasetItems] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Dataset Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Dataset Items', await dataSource.query(sSQL));
+        return result;
     }
     async CompanyIntegrationRecordMapsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Record Maps', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRecordMaps] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Record Maps', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRecordMaps] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Record Maps', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Company Integration Record Maps', await dataSource.query(sSQL));
+        return result;
     }
     async RecordMergeLogsArray(entity_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Record Merge Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwRecordMergeLogs] WHERE EntityID=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwRecordMergeLogs] WHERE [EntityID]=${entity_.ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Record Merge Logs', await dataSource.query(sSQL));
+        return result;
     }
     async CreateEntity(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -4271,11 +4332,9 @@ let EntityResolverBase = class EntityResolverBase extends server_1.ResolverBase
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateEntity(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -4302,9 +4361,10 @@ let EntityResolverBase = class EntityResolverBase extends server_1.ResolverBase
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Entities', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -4362,7 +4422,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], EntityResolverBase.prototype, "AllEntities", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [EntityField_]),
@@ -4563,7 +4623,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], EntityResolverBase.prototype, "UpdateEntity", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => Entity_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -4899,103 +4959,123 @@ let UserResolverBase = class UserResolverBase extends server_1.ResolverBase {
     }
     async User(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Users', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUsers WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Users', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUsers] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Users', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Users', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllUsers({ dataSource, userPayload }, pubSub) {
+    async AllUsers({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Users', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwUsers' + this.getRowLevelSecurityWhereClause('Users', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwUsers]' + this.getRowLevelSecurityWhereClause('Users', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Users', await dataSource.query(sSQL));
+        return result;
     }
     async UserApplicationsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Applications', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserApplications] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Applications', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserApplications] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Applications', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Applications', await dataSource.query(sSQL));
+        return result;
     }
     async UserRolesArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserRoles] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserRoles] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Roles', await dataSource.query(sSQL));
+        return result;
     }
     async WorkspacesArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workspaces', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwWorkspaces] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Workspaces', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwWorkspaces] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Workspaces', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Workspaces', await dataSource.query(sSQL));
+        return result;
     }
     async ReportsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Reports', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Reports', await dataSource.query(sSQL));
+        return result;
     }
     async ReportSnapshotsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Report Snapshots', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwReportSnapshots] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Report Snapshots', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwReportSnapshots] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Report Snapshots', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Report Snapshots', await dataSource.query(sSQL));
+        return result;
     }
     async RecordChangesArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Record Changes', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwRecordChanges] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Record Changes', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwRecordChanges] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Record Changes', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Record Changes', await dataSource.query(sSQL));
+        return result;
     }
     async DashboardsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Dashboards', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwDashboards] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Dashboards', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwDashboards] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Dashboards', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Dashboards', await dataSource.query(sSQL));
+        return result;
     }
     async UserViewRunsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User View Runs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserViewRuns] WHERE RunByUserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User View Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserViewRuns] WHERE [RunByUserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User View Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User View Runs', await dataSource.query(sSQL));
+        return result;
     }
     async AuditLogsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Audit Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAuditLogs] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAuditLogs] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Audit Logs', await dataSource.query(sSQL));
+        return result;
     }
     async ListsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Lists', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwLists] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Lists', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwLists] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Lists', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Lists', await dataSource.query(sSQL));
+        return result;
     }
     async UserFavoritesArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Favorites', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserFavorites] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Favorites', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserFavorites] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Favorites', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Favorites', await dataSource.query(sSQL));
+        return result;
     }
     async UserRecordLogsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Record Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserRecordLogs] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Record Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserRecordLogs] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Record Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Record Logs', await dataSource.query(sSQL));
+        return result;
     }
     async UserViewsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Views', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserViews] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Views', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserViews] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Views', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Views', await dataSource.query(sSQL));
+        return result;
     }
     async CompanyIntegrationRunsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Runs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRuns] WHERE RunByUserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRuns] WHERE [RunByUserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Company Integration Runs', await dataSource.query(sSQL));
+        return result;
     }
     async UserNotificationsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Notifications', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserNotifications] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Notifications', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserNotifications] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('User Notifications', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Notifications', await dataSource.query(sSQL));
+        return result;
     }
     async ConversationsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Conversations', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwConversations] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Conversations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwConversations] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Conversations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Conversations', await dataSource.query(sSQL));
+        return result;
     }
     async ResourceFoldersArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Resource Folders', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwResourceFolders] WHERE UserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Resource Folders', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwResourceFolders] WHERE [UserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Resource Folders', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Resource Folders', await dataSource.query(sSQL));
+        return result;
     }
     async RecordMergeLogsArray(user_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Record Merge Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwRecordMergeLogs] WHERE InitiatedByUserID=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwRecordMergeLogs] WHERE [InitiatedByUserID]=${user_.ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Record Merge Logs', await dataSource.query(sSQL));
+        return result;
     }
     async CreateUser(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -5013,11 +5093,9 @@ let UserResolverBase = class UserResolverBase extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateUser(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -5084,7 +5162,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], UserResolverBase.prototype, "AllUsers", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [UserApplication_]),
@@ -5378,7 +5456,7 @@ __decorate([
 ], EntityRelationship_.prototype, "RelatedEntityBaseView", void 0);
 __decorate([
     (0, server_1.Field)({ nullable: true }),
-    (0, class_validator_1.MaxLength)(1022),
+    (0, class_validator_1.MaxLength)(8000),
     __metadata("design:type", String)
 ], EntityRelationship_.prototype, "RelatedEntityClassName", void 0);
 __decorate([
@@ -5388,7 +5466,7 @@ __decorate([
 ], EntityRelationship_.prototype, "RelatedEntityCodeName", void 0);
 __decorate([
     (0, server_1.Field)({ nullable: true }),
-    (0, class_validator_1.MaxLength)(1022),
+    (0, class_validator_1.MaxLength)(8000),
     __metadata("design:type", String)
 ], EntityRelationship_.prototype, "RelatedEntityBaseTableCodeName", void 0);
 __decorate([
@@ -5563,13 +5641,15 @@ let EntityRelationshipResolver = class EntityRelationshipResolver extends server
     }
     async EntityRelationship(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Relationships', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEntityRelationships WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Entity Relationships', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEntityRelationships] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Entity Relationships', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Entity Relationships', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllEntityRelationships({ dataSource, userPayload }, pubSub) {
+    async AllEntityRelationships({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Relationships', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwEntityRelationships' + this.getRowLevelSecurityWhereClause('Entity Relationships', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwEntityRelationships]' + this.getRowLevelSecurityWhereClause('Entity Relationships', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Relationships', await dataSource.query(sSQL));
+        return result;
     }
     async CreateEntityRelationship(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -5587,11 +5667,9 @@ let EntityRelationshipResolver = class EntityRelationshipResolver extends server
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateEntityRelationship(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -5618,9 +5696,10 @@ let EntityRelationshipResolver = class EntityRelationshipResolver extends server
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Entity Relationships', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -5678,7 +5757,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], EntityRelationshipResolver.prototype, "AllEntityRelationships", null);
 __decorate([
     (0, server_1.Mutation)(() => EntityRelationship_),
@@ -5699,7 +5778,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], EntityRelationshipResolver.prototype, "UpdateEntityRelationship", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => EntityRelationship_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -5859,8 +5938,9 @@ let UserRecordLogResolver = class UserRecordLogResolver extends server_1.Resolve
     }
     async UserRecordLog(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Record Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUserRecordLogs WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('User Record Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUserRecordLogs] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('User Record Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('User Record Logs', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async UpdateUserRecordLog(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -6252,23 +6332,27 @@ let UserViewResolverBase = class UserViewResolverBase extends server_1.ResolverB
     }
     async UserView(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Views', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUserViews WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('User Views', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUserViews] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('User Views', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('User Views', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllUserViews({ dataSource, userPayload }, pubSub) {
+    async AllUserViews({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Views', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwUserViews' + this.getRowLevelSecurityWhereClause('User Views', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwUserViews]' + this.getRowLevelSecurityWhereClause('User Views', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Views', await dataSource.query(sSQL));
+        return result;
     }
     async EntityRelationshipsArray(userview_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Relationships', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityRelationships] WHERE DisplayUserViewGUID=${userview_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Relationships', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityRelationships] WHERE [DisplayUserViewGUID]=${userview_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Relationships', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Relationships', await dataSource.query(sSQL));
+        return result;
     }
     async UserViewRunsArray(userview_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User View Runs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserViewRuns] WHERE UserViewID=${userview_.ID} ` + this.getRowLevelSecurityWhereClause('User View Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserViewRuns] WHERE [UserViewID]=${userview_.ID} ` + this.getRowLevelSecurityWhereClause('User View Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User View Runs', await dataSource.query(sSQL));
+        return result;
     }
     async CreateUserView(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -6286,11 +6370,9 @@ let UserViewResolverBase = class UserViewResolverBase extends server_1.ResolverB
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateUserView(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -6318,9 +6400,10 @@ let UserViewResolverBase = class UserViewResolverBase extends server_1.ResolverB
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('User Views', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -6378,7 +6461,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], UserViewResolverBase.prototype, "AllUserViews", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [EntityRelationship_]),
@@ -6417,7 +6500,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], UserViewResolverBase.prototype, "UpdateUserView", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => UserView_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -6563,23 +6646,27 @@ let CompanyIntegrationRunResolver = class CompanyIntegrationRunResolver extends
     }
     async CompanyIntegrationRun(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Runs', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwCompanyIntegrationRuns WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRuns] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Company Integration Runs', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CompanyIntegrationRunAPILogsArray(companyintegrationrun_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Run API Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRunAPILogs] WHERE CompanyIntegrationRunID=${companyintegrationrun_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run API Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRunAPILogs] WHERE [CompanyIntegrationRunID]=${companyintegrationrun_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run API Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Company Integration Run API Logs', await dataSource.query(sSQL));
+        return result;
     }
     async ErrorLogsArray(companyintegrationrun_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Error Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwErrorLogs] WHERE CompanyIntegrationRunID=${companyintegrationrun_.ID} ` + this.getRowLevelSecurityWhereClause('Error Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwErrorLogs] WHERE [CompanyIntegrationRunID]=${companyintegrationrun_.ID} ` + this.getRowLevelSecurityWhereClause('Error Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Error Logs', await dataSource.query(sSQL));
+        return result;
     }
     async CompanyIntegrationRunDetailsArray(companyintegrationrun_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Run Details', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRunDetails] WHERE CompanyIntegrationRunID=${companyintegrationrun_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRunDetails] WHERE [CompanyIntegrationRunID]=${companyintegrationrun_.ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Company Integration Run Details', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateCompanyIntegrationRun(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -6816,13 +6903,15 @@ let CompanyIntegrationRunDetailResolver = class CompanyIntegrationRunDetailResol
     }
     async CompanyIntegrationRunDetail(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Run Details', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwCompanyIntegrationRunDetails WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRunDetails] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Company Integration Run Details', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ErrorLogsArray(companyintegrationrundetail_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Error Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwErrorLogs] WHERE CompanyIntegrationRunDetailID=${companyintegrationrundetail_.ID} ` + this.getRowLevelSecurityWhereClause('Error Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwErrorLogs] WHERE [CompanyIntegrationRunDetailID]=${companyintegrationrundetail_.ID} ` + this.getRowLevelSecurityWhereClause('Error Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Error Logs', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateCompanyIntegrationRunDetail(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -7044,8 +7133,9 @@ let ErrorLogResolver = class ErrorLogResolver extends server_1.ResolverBase {
     }
     async ErrorLog(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Error Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwErrorLogs WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Error Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwErrorLogs] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Error Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Error Logs', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async UpdateErrorLog(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -7221,23 +7311,27 @@ let ApplicationResolver = class ApplicationResolver extends server_1.ResolverBas
     }
     async Application(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Applications', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwApplications WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Applications', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwApplications] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Applications', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Applications', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllApplications({ dataSource, userPayload }, pubSub) {
+    async AllApplications({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Applications', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwApplications' + this.getRowLevelSecurityWhereClause('Applications', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwApplications]' + this.getRowLevelSecurityWhereClause('Applications', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Applications', await dataSource.query(sSQL));
+        return result;
     }
     async ApplicationEntitiesArray(application_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Application Entities', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwApplicationEntities] WHERE ApplicationID=${application_.ID} ` + this.getRowLevelSecurityWhereClause('Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwApplicationEntities] WHERE [ApplicationID]=${application_.ID} ` + this.getRowLevelSecurityWhereClause('Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Application Entities', await dataSource.query(sSQL));
+        return result;
     }
     async UserApplicationsArray(application_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Applications', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserApplications] WHERE ApplicationID=${application_.ID} ` + this.getRowLevelSecurityWhereClause('User Applications', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserApplications] WHERE [ApplicationID]=${application_.ID} ` + this.getRowLevelSecurityWhereClause('User Applications', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Applications', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateApplication(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -7303,7 +7397,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], ApplicationResolver.prototype, "AllApplications", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [ApplicationEntity_]),
@@ -7391,12 +7485,12 @@ __decorate([
 ], ApplicationEntity_.prototype, "EntityCodeName", void 0);
 __decorate([
     (0, server_1.Field)({ nullable: true }),
-    (0, class_validator_1.MaxLength)(1022),
+    (0, class_validator_1.MaxLength)(8000),
     __metadata("design:type", String)
 ], ApplicationEntity_.prototype, "EntityClassName", void 0);
 __decorate([
     (0, server_1.Field)({ nullable: true }),
-    (0, class_validator_1.MaxLength)(1022),
+    (0, class_validator_1.MaxLength)(8000),
     __metadata("design:type", String)
 ], ApplicationEntity_.prototype, "EntityBaseTableCodeName", void 0);
 ApplicationEntity_ = __decorate([
@@ -7502,8 +7596,9 @@ let ApplicationEntityResolver = class ApplicationEntityResolver extends server_1
     }
     async ApplicationEntity(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Application Entities', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwApplicationEntities WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwApplicationEntities] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Application Entities', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateApplicationEntity(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -7521,11 +7616,9 @@ let ApplicationEntityResolver = class ApplicationEntityResolver extends server_1
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateApplicationEntity(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -7552,9 +7645,10 @@ let ApplicationEntityResolver = class ApplicationEntityResolver extends server_1
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Application Entities', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -7625,7 +7719,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], ApplicationEntityResolver.prototype, "UpdateApplicationEntity", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => ApplicationEntity_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -7875,13 +7969,15 @@ let EntityPermissionResolver = class EntityPermissionResolver extends server_1.R
     }
     async EntityPermission(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Permissions', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEntityPermissions WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEntityPermissions] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Entity Permissions', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllEntityPermissions({ dataSource, userPayload }, pubSub) {
+    async AllEntityPermissions({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Permissions', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwEntityPermissions' + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwEntityPermissions]' + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Permissions', await dataSource.query(sSQL));
+        return result;
     }
     async CreateEntityPermission(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -7899,11 +7995,9 @@ let EntityPermissionResolver = class EntityPermissionResolver extends server_1.R
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateEntityPermission(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -7930,9 +8024,10 @@ let EntityPermissionResolver = class EntityPermissionResolver extends server_1.R
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Entity Permissions', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -7990,7 +8085,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], EntityPermissionResolver.prototype, "AllEntityPermissions", null);
 __decorate([
     (0, server_1.Mutation)(() => EntityPermission_),
@@ -8011,7 +8106,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], EntityPermissionResolver.prototype, "UpdateEntityPermission", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => EntityPermission_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -8151,8 +8246,9 @@ let UserApplicationEntityResolver = class UserApplicationEntityResolver extends
     }
     async UserApplicationEntity(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Application Entities', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUserApplicationEntities WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('User Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUserApplicationEntities] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('User Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('User Application Entities', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateUserApplicationEntity(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -8170,11 +8266,9 @@ let UserApplicationEntityResolver = class UserApplicationEntityResolver extends
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateUserApplicationEntity(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -8201,9 +8295,10 @@ let UserApplicationEntityResolver = class UserApplicationEntityResolver extends
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('User Application Entities', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -8274,7 +8369,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], UserApplicationEntityResolver.prototype, "UpdateUserApplicationEntity", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => UserApplicationEntity_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -8399,13 +8494,15 @@ let UserApplicationResolver = class UserApplicationResolver extends server_1.Res
     }
     async UserApplication(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Applications', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUserApplications WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('User Applications', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUserApplications] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('User Applications', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('User Applications', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async UserApplicationEntitiesArray(userapplication_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Application Entities', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserApplicationEntities] WHERE UserApplicationID=${userapplication_.ID} ` + this.getRowLevelSecurityWhereClause('User Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserApplicationEntities] WHERE [UserApplicationID]=${userapplication_.ID} ` + this.getRowLevelSecurityWhereClause('User Application Entities', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Application Entities', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateUserApplication(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -8604,8 +8701,9 @@ let CompanyIntegrationRunAPILogResolver = class CompanyIntegrationRunAPILogResol
     }
     async CompanyIntegrationRunAPILog(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Run API Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwCompanyIntegrationRunAPILogs WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run API Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRunAPILogs] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Run API Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Company Integration Run API Logs', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async UpdateCompanyIntegrationRunAPILog(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -8853,13 +8951,15 @@ let ListResolver = class ListResolver extends server_1.ResolverBase {
     }
     async List(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Lists', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwLists WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Lists', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwLists] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Lists', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Lists', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ListDetailsArray(list_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('List Details', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwListDetails] WHERE ListID=${list_.ID} ` + this.getRowLevelSecurityWhereClause('List Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwListDetails] WHERE [ListID]=${list_.ID} ` + this.getRowLevelSecurityWhereClause('List Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('List Details', await dataSource.query(sSQL));
+        return result;
     }
     async CreateList(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -8877,11 +8977,9 @@ let ListResolver = class ListResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateList(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -8908,9 +9006,10 @@ let ListResolver = class ListResolver extends server_1.ResolverBase {
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Lists', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -8990,7 +9089,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], ListResolver.prototype, "UpdateList", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => List_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -9116,8 +9215,9 @@ let ListDetailResolver = class ListDetailResolver extends server_1.ResolverBase
     }
     async ListDetail(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('List Details', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwListDetails WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('List Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwListDetails] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('List Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('List Details', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateListDetail(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -9135,11 +9235,9 @@ let ListDetailResolver = class ListDetailResolver extends server_1.ResolverBase
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateListDetail(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -9166,9 +9264,10 @@ let ListDetailResolver = class ListDetailResolver extends server_1.ResolverBase
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('List Details', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -9239,7 +9338,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], ListDetailResolver.prototype, "UpdateListDetail", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => ListDetail_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -9379,13 +9478,15 @@ let UserViewRunResolver = class UserViewRunResolver extends server_1.ResolverBas
     }
     async UserViewRun(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User View Runs', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUserViewRuns WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('User View Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUserViewRuns] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('User View Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('User View Runs', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async UserViewRunDetailsArray(userviewrun_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User View Run Details', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwUserViewRunDetails] WHERE UserViewRunID=${userviewrun_.ID} ` + this.getRowLevelSecurityWhereClause('User View Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwUserViewRunDetails] WHERE [UserViewRunID]=${userviewrun_.ID} ` + this.getRowLevelSecurityWhereClause('User View Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('User View Run Details', await dataSource.query(sSQL));
+        return result;
     }
     async CreateUserViewRun(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -9403,11 +9504,9 @@ let UserViewRunResolver = class UserViewRunResolver extends server_1.ResolverBas
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateUserViewRun(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -9608,8 +9707,9 @@ let UserViewRunDetailResolver = class UserViewRunDetailResolver extends server_1
     }
     async UserViewRunDetail(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User View Run Details', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUserViewRunDetails WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('User View Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUserViewRunDetails] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('User View Run Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('User View Run Details', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateUserViewRunDetail(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -9627,11 +9727,9 @@ let UserViewRunDetailResolver = class UserViewRunDetailResolver extends server_1
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateUserViewRunDetail(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -9843,8 +9941,9 @@ let WorkflowRunResolver = class WorkflowRunResolver extends server_1.ResolverBas
     }
     async WorkflowRun(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workflow Runs', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwWorkflowRuns WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Workflow Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwWorkflowRuns] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Workflow Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Workflow Runs', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async UpdateWorkflowRun(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -10046,18 +10145,21 @@ let WorkflowResolver = class WorkflowResolver extends server_1.ResolverBase {
     }
     async Workflow(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workflows', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwWorkflows WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Workflows', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwWorkflows] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Workflows', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Workflows', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ReportsArray(workflow_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Reports', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE OutputWorkflowID=${workflow_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE [OutputWorkflowID]=${workflow_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Reports', await dataSource.query(sSQL));
+        return result;
     }
     async WorkflowRunsArray(workflow_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workflow Runs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwWorkflowRuns] WHERE WorkflowName=${workflow_.ID} ` + this.getRowLevelSecurityWhereClause('Workflow Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwWorkflowRuns] WHERE [WorkflowName]=${workflow_.ID} ` + this.getRowLevelSecurityWhereClause('Workflow Runs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Workflow Runs', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateWorkflow(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -10264,13 +10366,15 @@ let WorkflowEngineResolver = class WorkflowEngineResolver extends server_1.Resol
     }
     async WorkflowEngine(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workflow Engines', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwWorkflowEngines WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Workflow Engines', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwWorkflowEngines] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Workflow Engines', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Workflow Engines', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async WorkflowsArray(workflowengine_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workflows', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwWorkflows] WHERE WorkflowEngineName=${workflowengine_.ID} ` + this.getRowLevelSecurityWhereClause('Workflows', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwWorkflows] WHERE [WorkflowEngineName]=${workflowengine_.ID} ` + this.getRowLevelSecurityWhereClause('Workflows', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Workflows', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateWorkflowEngine(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -10500,8 +10604,9 @@ let RecordChangeResolver = class RecordChangeResolver extends server_1.ResolverB
     }
     async RecordChange(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Record Changes', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwRecordChanges WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Record Changes', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwRecordChanges] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Record Changes', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Record Changes', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateRecordChange(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -10519,11 +10624,9 @@ let RecordChangeResolver = class RecordChangeResolver extends server_1.ResolverB
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
 };
 __decorate([
@@ -10670,13 +10773,15 @@ let UserRoleResolver = class UserRoleResolver extends server_1.ResolverBase {
     }
     async UserRole(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUserRoles WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('User Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUserRoles] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('User Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('User Roles', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllUserRoles({ dataSource, userPayload }, pubSub) {
+    async AllUserRoles({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Roles', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwUserRoles' + this.getRowLevelSecurityWhereClause('User Roles', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwUserRoles]' + this.getRowLevelSecurityWhereClause('User Roles', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('User Roles', await dataSource.query(sSQL));
+        return result;
     }
     async CreateUserRole(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -10694,11 +10799,9 @@ let UserRoleResolver = class UserRoleResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
 };
 __decorate([
@@ -10743,7 +10846,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], UserRoleResolver.prototype, "AllUserRoles", null);
 __decorate([
     (0, server_1.Mutation)(() => UserRole_),
@@ -10842,18 +10945,21 @@ let RowLevelSecurityFilterResolver = class RowLevelSecurityFilterResolver extend
     }
     async RowLevelSecurityFilter(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Row Level Security Filters', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwRowLevelSecurityFilters WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Row Level Security Filters', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwRowLevelSecurityFilters] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Row Level Security Filters', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Row Level Security Filters', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllRowLevelSecurityFilters({ dataSource, userPayload }, pubSub) {
+    async AllRowLevelSecurityFilters({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Row Level Security Filters', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwRowLevelSecurityFilters' + this.getRowLevelSecurityWhereClause('Row Level Security Filters', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwRowLevelSecurityFilters]' + this.getRowLevelSecurityWhereClause('Row Level Security Filters', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Row Level Security Filters', await dataSource.query(sSQL));
+        return result;
     }
     async EntityPermissionsArray(rowlevelsecurityfilter_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Permissions', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityPermissions] WHERE ReadRLSFilterID=${rowlevelsecurityfilter_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityPermissions] WHERE [ReadRLSFilterID]=${rowlevelsecurityfilter_.ID} ` + this.getRowLevelSecurityWhereClause('Entity Permissions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Permissions', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -10898,7 +11004,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], RowLevelSecurityFilterResolver.prototype, "AllRowLevelSecurityFilters", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [EntityPermission_]),
@@ -11106,8 +11212,9 @@ let AuditLogResolver = class AuditLogResolver extends server_1.ResolverBase {
     }
     async AuditLog(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Audit Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwAuditLogs WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwAuditLogs] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Audit Logs', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateAuditLog(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -11125,11 +11232,9 @@ let AuditLogResolver = class AuditLogResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateAuditLog(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -11315,33 +11420,39 @@ let AuthorizationResolver = class AuthorizationResolver extends server_1.Resolve
     }
     async Authorization(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Authorizations', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwAuthorizations WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Authorizations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwAuthorizations] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Authorizations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Authorizations', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllAuthorizations({ dataSource, userPayload }, pubSub) {
+    async AllAuthorizations({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Authorizations', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwAuthorizations' + this.getRowLevelSecurityWhereClause('Authorizations', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwAuthorizations]' + this.getRowLevelSecurityWhereClause('Authorizations', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Authorizations', await dataSource.query(sSQL));
+        return result;
     }
     async AuthorizationRolesArray(authorization_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Authorization Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAuthorizationRoles] WHERE AuthorizationID=${authorization_.ID} ` + this.getRowLevelSecurityWhereClause('Authorization Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAuthorizationRoles] WHERE [AuthorizationID]=${authorization_.ID} ` + this.getRowLevelSecurityWhereClause('Authorization Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Authorization Roles', await dataSource.query(sSQL));
+        return result;
     }
     async AuthorizationsArray(authorization_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Authorizations', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAuthorizations] WHERE ParentID=${authorization_.ID} ` + this.getRowLevelSecurityWhereClause('Authorizations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAuthorizations] WHERE [ParentID]=${authorization_.ID} ` + this.getRowLevelSecurityWhereClause('Authorizations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Authorizations', await dataSource.query(sSQL));
+        return result;
     }
     async AuditLogTypesArray(authorization_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Audit Log Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAuditLogTypes] WHERE AuthorizationName=${authorization_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Log Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAuditLogTypes] WHERE [AuthorizationName]=${authorization_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Log Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Audit Log Types', await dataSource.query(sSQL));
+        return result;
     }
     async AuditLogsArray(authorization_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Audit Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAuditLogs] WHERE AuthorizationName=${authorization_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAuditLogs] WHERE [AuthorizationName]=${authorization_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Audit Logs', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -11386,7 +11497,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], AuthorizationResolver.prototype, "AllAuthorizations", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [AuthorizationRole_]),
@@ -11510,13 +11621,15 @@ let AuthorizationRoleResolver = class AuthorizationRoleResolver extends server_1
     }
     async AuthorizationRole(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Authorization Roles', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwAuthorizationRoles WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Authorization Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwAuthorizationRoles] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Authorization Roles', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Authorization Roles', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllAuthorizationRoles({ dataSource, userPayload }, pubSub) {
+    async AllAuthorizationRoles({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Authorization Roles', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwAuthorizationRoles' + this.getRowLevelSecurityWhereClause('Authorization Roles', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwAuthorizationRoles]' + this.getRowLevelSecurityWhereClause('Authorization Roles', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Authorization Roles', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -11561,7 +11674,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], AuthorizationRoleResolver.prototype, "AllAuthorizationRoles", null);
 AuthorizationRoleResolver = __decorate([
     (0, server_1.Resolver)(AuthorizationRole_)
@@ -11665,23 +11778,27 @@ let AuditLogTypeResolver = class AuditLogTypeResolver extends server_1.ResolverB
     }
     async AuditLogType(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Audit Log Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwAuditLogTypes WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Audit Log Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwAuditLogTypes] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Audit Log Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Audit Log Types', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllAuditLogTypes({ dataSource, userPayload }, pubSub) {
+    async AllAuditLogTypes({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Audit Log Types', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwAuditLogTypes' + this.getRowLevelSecurityWhereClause('Audit Log Types', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwAuditLogTypes]' + this.getRowLevelSecurityWhereClause('Audit Log Types', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Audit Log Types', await dataSource.query(sSQL));
+        return result;
     }
     async AuditLogsArray(auditlogtype_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Audit Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAuditLogs] WHERE AuditLogTypeName=${auditlogtype_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAuditLogs] WHERE [AuditLogTypeName]=${auditlogtype_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Audit Logs', await dataSource.query(sSQL));
+        return result;
     }
     async AuditLogTypesArray(auditlogtype_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Audit Log Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAuditLogTypes] WHERE ParentID=${auditlogtype_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Log Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAuditLogTypes] WHERE [ParentID]=${auditlogtype_.ID} ` + this.getRowLevelSecurityWhereClause('Audit Log Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Audit Log Types', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -11726,7 +11843,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], AuditLogTypeResolver.prototype, "AllAuditLogTypes", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [AuditLog_]),
@@ -11849,13 +11966,15 @@ let EntityFieldValueResolver = class EntityFieldValueResolver extends server_1.R
     }
     async EntityFieldValue(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Field Values', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEntityFieldValues WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Entity Field Values', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEntityFieldValues] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Entity Field Values', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Entity Field Values', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllEntityFieldValues({ dataSource, userPayload }, pubSub) {
+    async AllEntityFieldValues({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity Field Values', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwEntityFieldValues' + this.getRowLevelSecurityWhereClause('Entity Field Values', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwEntityFieldValues]' + this.getRowLevelSecurityWhereClause('Entity Field Values', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity Field Values', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -11900,7 +12019,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], EntityFieldValueResolver.prototype, "AllEntityFieldValues", null);
 EntityFieldValueResolver = __decorate([
     (0, server_1.Resolver)(EntityFieldValue_)
@@ -12055,28 +12174,33 @@ let AIModelResolver = class AIModelResolver extends server_1.ResolverBase {
     }
     async AIModel(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Models', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwAIModels WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('AI Models', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwAIModels] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('AI Models', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('AI Models', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllAIModels({ dataSource, userPayload }, pubSub) {
+    async AllAIModels({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Models', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwAIModels' + this.getRowLevelSecurityWhereClause('AI Models', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwAIModels]' + this.getRowLevelSecurityWhereClause('AI Models', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('AI Models', await dataSource.query(sSQL));
+        return result;
     }
     async AIActionsArray(aimodel_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Actions', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAIActions] WHERE DefaultModelID=${aimodel_.ID} ` + this.getRowLevelSecurityWhereClause('AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAIActions] WHERE [DefaultModelID]=${aimodel_.ID} ` + this.getRowLevelSecurityWhereClause('AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('AI Actions', await dataSource.query(sSQL));
+        return result;
     }
     async AIModelActionsArray(aimodel_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Model Actions', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAIModelActions] WHERE AIModelID=${aimodel_.ID} ` + this.getRowLevelSecurityWhereClause('AI Model Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAIModelActions] WHERE [AIModelID]=${aimodel_.ID} ` + this.getRowLevelSecurityWhereClause('AI Model Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('AI Model Actions', await dataSource.query(sSQL));
+        return result;
     }
     async EntityAIActionsArray(aimodel_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity AI Actions', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityAIActions] WHERE AIModelID=${aimodel_.ID} ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityAIActions] WHERE [AIModelID]=${aimodel_.ID} ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity AI Actions', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateAIModel(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -12142,7 +12266,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], AIModelResolver.prototype, "AllAIModels", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [AIAction_]),
@@ -12315,23 +12439,27 @@ let AIActionResolver = class AIActionResolver extends server_1.ResolverBase {
     }
     async AIAction(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Actions', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwAIActions WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwAIActions] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('AI Actions', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllAIActions({ dataSource, userPayload }, pubSub) {
+    async AllAIActions({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Actions', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwAIActions' + this.getRowLevelSecurityWhereClause('AI Actions', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwAIActions]' + this.getRowLevelSecurityWhereClause('AI Actions', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('AI Actions', await dataSource.query(sSQL));
+        return result;
     }
     async AIModelActionsArray(aiaction_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Model Actions', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAIModelActions] WHERE AIActionID=${aiaction_.ID} ` + this.getRowLevelSecurityWhereClause('AI Model Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAIModelActions] WHERE [AIActionID]=${aiaction_.ID} ` + this.getRowLevelSecurityWhereClause('AI Model Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('AI Model Actions', await dataSource.query(sSQL));
+        return result;
     }
     async EntityAIActionsArray(aiaction_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity AI Actions', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwEntityAIActions] WHERE AIActionID=${aiaction_.ID} ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwEntityAIActions] WHERE [AIActionID]=${aiaction_.ID} ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity AI Actions', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateAIAction(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -12397,7 +12525,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], AIActionResolver.prototype, "AllAIActions", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [AIModelAction_]),
@@ -12541,13 +12669,15 @@ let AIModelActionResolver = class AIModelActionResolver extends server_1.Resolve
     }
     async AIModelAction(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Model Actions', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwAIModelActions WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('AI Model Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwAIModelActions] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('AI Model Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('AI Model Actions', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllAIModelActions({ dataSource, userPayload }, pubSub) {
+    async AllAIModelActions({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Model Actions', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwAIModelActions' + this.getRowLevelSecurityWhereClause('AI Model Actions', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwAIModelActions]' + this.getRowLevelSecurityWhereClause('AI Model Actions', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('AI Model Actions', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateAIModelAction(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -12613,7 +12743,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], AIModelActionResolver.prototype, "AllAIModelActions", null);
 __decorate([
     (0, server_1.Mutation)(() => AIModelAction_),
@@ -12815,13 +12945,15 @@ let EntityAIActionResolver = class EntityAIActionResolver extends server_1.Resol
     }
     async EntityAIAction(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity AI Actions', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwEntityAIActions WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwEntityAIActions] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Entity AI Actions', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllEntityAIActions({ dataSource, userPayload }, pubSub) {
+    async AllEntityAIActions({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Entity AI Actions', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwEntityAIActions' + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwEntityAIActions]' + this.getRowLevelSecurityWhereClause('Entity AI Actions', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('Entity AI Actions', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateEntityAIAction(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -12887,7 +13019,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], EntityAIActionResolver.prototype, "AllEntityAIActions", null);
 __decorate([
     (0, server_1.Mutation)(() => EntityAIAction_),
@@ -12990,18 +13122,21 @@ let AIModelTypeResolver = class AIModelTypeResolver extends server_1.ResolverBas
     }
     async AIModelType(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Model Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwAIModelTypes WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('AI Model Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwAIModelTypes] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('AI Model Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('AI Model Types', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
-    AllAIModelTypes({ dataSource, userPayload }, pubSub) {
+    async AllAIModelTypes({ dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Model Types', userPayload);
-        const sSQL = 'SELECT * FROM [admin].vwAIModelTypes' + this.getRowLevelSecurityWhereClause('AI Model Types', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
-        return dataSource.query(sSQL);
+        const sSQL = 'SELECT * FROM [admin].[vwAIModelTypes]' + this.getRowLevelSecurityWhereClause('AI Model Types', userPayload, core_1.EntityPermissionType.Read, ' WHERE');
+        const result = this.ArrayMapFieldNamesToCodeNames('AI Model Types', await dataSource.query(sSQL));
+        return result;
     }
     async AIModelsArray(aimodeltype_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('AI Models', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwAIModels] WHERE AIModelTypeID=${aimodeltype_.ID} ` + this.getRowLevelSecurityWhereClause('AI Models', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwAIModels] WHERE [AIModelTypeID]=${aimodeltype_.ID} ` + this.getRowLevelSecurityWhereClause('AI Models', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('AI Models', await dataSource.query(sSQL));
+        return result;
     }
     async UpdateAIModelType(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -13067,7 +13202,7 @@ __decorate([
     __param(1, (0, server_1.PubSub)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, server_1.PubSubEngine]),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], AIModelTypeResolver.prototype, "AllAIModelTypes", null);
 __decorate([
     (0, server_1.FieldResolver)(() => [AIModel_]),
@@ -13175,13 +13310,15 @@ let QueueTypeResolver = class QueueTypeResolver extends server_1.ResolverBase {
     }
     async QueueType(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Queue Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwQueueTypes WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Queue Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwQueueTypes] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Queue Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Queue Types', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async QueuesArray(queuetype_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Queues', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwQueues] WHERE QueueTypeID=${queuetype_.ID} ` + this.getRowLevelSecurityWhereClause('Queues', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwQueues] WHERE [QueueTypeID]=${queuetype_.ID} ` + this.getRowLevelSecurityWhereClause('Queues', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Queues', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -13529,13 +13666,15 @@ let QueueResolver = class QueueResolver extends server_1.ResolverBase {
     }
     async Queue(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Queues', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwQueues WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Queues', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwQueues] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Queues', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Queues', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async QueueTasksArray(queue_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Queue Tasks', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwQueueTasks] WHERE QueueID=${queue_.ID} ` + this.getRowLevelSecurityWhereClause('Queue Tasks', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwQueueTasks] WHERE [QueueID]=${queue_.ID} ` + this.getRowLevelSecurityWhereClause('Queue Tasks', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Queue Tasks', await dataSource.query(sSQL));
+        return result;
     }
     async CreateQueue(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -13553,11 +13692,9 @@ let QueueResolver = class QueueResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateQueue(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -13832,8 +13969,9 @@ let QueueTaskResolver = class QueueTaskResolver extends server_1.ResolverBase {
     }
     async QueueTask(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Queue Tasks', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwQueueTasks WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Queue Tasks', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwQueueTasks] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Queue Tasks', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Queue Tasks', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateQueueTask(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -13851,11 +13989,9 @@ let QueueTaskResolver = class QueueTaskResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateQueueTask(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -14064,9 +14200,10 @@ let DashboardResolver = class DashboardResolver extends server_1.ResolverBase {
     }
     async Dashboard(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Dashboards', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwDashboards WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Dashboards', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [admin].[vwDashboards] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Dashboards', userPayload, core_1.EntityPermissionType.Read, 'AND');
         this.createRecordAccessAuditLogRecord(userPayload, 'Dashboards', ID);
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const result = this.MapFieldNamesToCodeNames('Dashboards', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateDashboard(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -14084,11 +14221,9 @@ let DashboardResolver = class DashboardResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateDashboard(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -14115,9 +14250,10 @@ let DashboardResolver = class DashboardResolver extends server_1.ResolverBase {
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Dashboards', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -14188,7 +14324,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], DashboardResolver.prototype, "UpdateDashboard", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => Dashboard_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -14270,14 +14406,16 @@ let OutputTriggerTypeResolver = class OutputTriggerTypeResolver extends server_1
     }
     async OutputTriggerType(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Output Trigger Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwOutputTriggerTypes WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Output Trigger Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [admin].[vwOutputTriggerTypes] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Output Trigger Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
         this.createRecordAccessAuditLogRecord(userPayload, 'Output Trigger Types', ID);
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const result = this.MapFieldNamesToCodeNames('Output Trigger Types', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ReportsArray(outputtriggertype_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Reports', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE OutputTriggerTypeID=${outputtriggertype_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE [OutputTriggerTypeID]=${outputtriggertype_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Reports', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -14403,14 +14541,16 @@ let OutputFormatTypeResolver = class OutputFormatTypeResolver extends server_1.R
     }
     async OutputFormatType(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Output Format Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwOutputFormatTypes WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Output Format Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [admin].[vwOutputFormatTypes] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Output Format Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
         this.createRecordAccessAuditLogRecord(userPayload, 'Output Format Types', ID);
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const result = this.MapFieldNamesToCodeNames('Output Format Types', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ReportsArray(outputformattype_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Reports', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE OutputFormatTypeID=${outputformattype_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE [OutputFormatTypeID]=${outputformattype_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Reports', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -14532,14 +14672,16 @@ let OutputDeliveryTypeResolver = class OutputDeliveryTypeResolver extends server
     }
     async OutputDeliveryType(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Output Delivery Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwOutputDeliveryTypes WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Output Delivery Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [admin].[vwOutputDeliveryTypes] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Output Delivery Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
         this.createRecordAccessAuditLogRecord(userPayload, 'Output Delivery Types', ID);
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const result = this.MapFieldNamesToCodeNames('Output Delivery Types', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ReportsArray(outputdeliverytype_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Reports', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE OutputDeliveryTypeID=${outputdeliverytype_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE [OutputDeliveryTypeID]=${outputdeliverytype_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Reports', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -14892,13 +15034,15 @@ let ReportResolver = class ReportResolver extends server_1.ResolverBase {
     }
     async Report(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Reports', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwReports WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Reports', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ReportSnapshotsArray(report_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Report Snapshots', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwReportSnapshots] WHERE ReportID=${report_.ID} ` + this.getRowLevelSecurityWhereClause('Report Snapshots', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwReportSnapshots] WHERE [ReportID]=${report_.ID} ` + this.getRowLevelSecurityWhereClause('Report Snapshots', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Report Snapshots', await dataSource.query(sSQL));
+        return result;
     }
     async CreateReport(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -14916,11 +15060,9 @@ let ReportResolver = class ReportResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateReport(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -14947,9 +15089,10 @@ let ReportResolver = class ReportResolver extends server_1.ResolverBase {
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Reports', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -15029,7 +15172,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], ReportResolver.prototype, "UpdateReport", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => Report_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -15165,8 +15308,9 @@ let ReportSnapshotResolver = class ReportSnapshotResolver extends server_1.Resol
     }
     async ReportSnapshot(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Report Snapshots', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwReportSnapshots WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Report Snapshots', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwReportSnapshots] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Report Snapshots', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Report Snapshots', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateReportSnapshot(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -15184,11 +15328,9 @@ let ReportSnapshotResolver = class ReportSnapshotResolver extends server_1.Resol
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateReportSnapshot(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -15215,9 +15357,10 @@ let ReportSnapshotResolver = class ReportSnapshotResolver extends server_1.Resol
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Report Snapshots', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -15288,7 +15431,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], ReportSnapshotResolver.prototype, "UpdateReportSnapshot", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => ReportSnapshot_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -15403,19 +15546,22 @@ let ResourceTypeResolver = class ResourceTypeResolver extends server_1.ResolverB
     }
     async ResourceType(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Resource Types', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwResourceTypes WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Resource Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [admin].[vwResourceTypes] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Resource Types', userPayload, core_1.EntityPermissionType.Read, 'AND');
         this.createRecordAccessAuditLogRecord(userPayload, 'Resource Types', ID);
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const result = this.MapFieldNamesToCodeNames('Resource Types', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async WorkspaceItemsArray(resourcetype_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workspace Items', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwWorkspaceItems] WHERE ResourceTypeID=${resourcetype_.ID} ` + this.getRowLevelSecurityWhereClause('Workspace Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwWorkspaceItems] WHERE [ResourceTypeID]=${resourcetype_.ID} ` + this.getRowLevelSecurityWhereClause('Workspace Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Workspace Items', await dataSource.query(sSQL));
+        return result;
     }
     async ResourceFoldersArray(resourcetype_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Resource Folders', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwResourceFolders] WHERE ResourceTypeName=${resourcetype_.ID} ` + this.getRowLevelSecurityWhereClause('Resource Folders', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwResourceFolders] WHERE [ResourceTypeName]=${resourcetype_.ID} ` + this.getRowLevelSecurityWhereClause('Resource Folders', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Resource Folders', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -15564,19 +15710,22 @@ let TagResolver = class TagResolver extends server_1.ResolverBase {
     }
     async Tag(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Tags', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwTags WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Tags', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [admin].[vwTags] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Tags', userPayload, core_1.EntityPermissionType.Read, 'AND');
         this.createRecordAccessAuditLogRecord(userPayload, 'Tags', ID);
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const result = this.MapFieldNamesToCodeNames('Tags', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async TagsArray(tag_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Tags', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwTags] WHERE ParentID=${tag_.ID} ` + this.getRowLevelSecurityWhereClause('Tags', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwTags] WHERE [ParentID]=${tag_.ID} ` + this.getRowLevelSecurityWhereClause('Tags', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Tags', await dataSource.query(sSQL));
+        return result;
     }
     async TaggedItemsArray(tag_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Tagged Items', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwTaggedItems] WHERE TagID=${tag_.ID} ` + this.getRowLevelSecurityWhereClause('Tagged Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwTaggedItems] WHERE [TagID]=${tag_.ID} ` + this.getRowLevelSecurityWhereClause('Tagged Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Tagged Items', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -15717,9 +15866,10 @@ let TaggedItemResolver = class TaggedItemResolver extends server_1.ResolverBase
     }
     async TaggedItem(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Tagged Items', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwTaggedItems WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Tagged Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [admin].[vwTaggedItems] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Tagged Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
         this.createRecordAccessAuditLogRecord(userPayload, 'Tagged Items', ID);
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const result = this.MapFieldNamesToCodeNames('Tagged Items', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
 };
 __decorate([
@@ -15881,14 +16031,16 @@ let WorkspaceResolver = class WorkspaceResolver extends server_1.ResolverBase {
     }
     async Workspace(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workspaces', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwWorkspaces WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Workspaces', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [admin].[vwWorkspaces] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Workspaces', userPayload, core_1.EntityPermissionType.Read, 'AND');
         this.createRecordAccessAuditLogRecord(userPayload, 'Workspaces', ID);
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const result = this.MapFieldNamesToCodeNames('Workspaces', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async WorkspaceItemsArray(workspace_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workspace Items', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwWorkspaceItems] WHERE WorkSpaceID=${workspace_.ID} ` + this.getRowLevelSecurityWhereClause('Workspace Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwWorkspaceItems] WHERE [WorkSpaceID]=${workspace_.ID} ` + this.getRowLevelSecurityWhereClause('Workspace Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Workspace Items', await dataSource.query(sSQL));
+        return result;
     }
     async CreateWorkspace(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -15906,11 +16058,9 @@ let WorkspaceResolver = class WorkspaceResolver extends server_1.ResolverBase {
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateWorkspace(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -15937,9 +16087,10 @@ let WorkspaceResolver = class WorkspaceResolver extends server_1.ResolverBase {
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Workspaces', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -16019,7 +16170,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], WorkspaceResolver.prototype, "UpdateWorkspace", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => Workspace_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -16200,9 +16351,10 @@ let WorkspaceItemResolver = class WorkspaceItemResolver extends server_1.Resolve
     }
     async WorkspaceItem(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Workspace Items', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwWorkspaceItems WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Workspace Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const sSQL = `SELECT * FROM [admin].[vwWorkspaceItems] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Workspace Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
         this.createRecordAccessAuditLogRecord(userPayload, 'Workspace Items', ID);
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const result = this.MapFieldNamesToCodeNames('Workspace Items', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateWorkspaceItem(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -16220,11 +16372,9 @@ let WorkspaceItemResolver = class WorkspaceItemResolver extends server_1.Resolve
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateWorkspaceItem(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -16251,9 +16401,10 @@ let WorkspaceItemResolver = class WorkspaceItemResolver extends server_1.Resolve
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Workspace Items', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -16324,7 +16475,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], WorkspaceItemResolver.prototype, "UpdateWorkspaceItem", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => WorkspaceItem_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -16416,13 +16567,15 @@ let DatasetResolver = class DatasetResolver extends server_1.ResolverBase {
     }
     async Dataset(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Datasets', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwDatasets WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Datasets', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwDatasets] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Datasets', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Datasets', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async DatasetItemsArray(dataset_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Dataset Items', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwDatasetItems] WHERE DatasetName=${dataset_.ID} ` + this.getRowLevelSecurityWhereClause('Dataset Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwDatasetItems] WHERE [DatasetName]=${dataset_.ID} ` + this.getRowLevelSecurityWhereClause('Dataset Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Dataset Items', await dataSource.query(sSQL));
+        return result;
     }
 };
 __decorate([
@@ -16577,8 +16730,9 @@ let DatasetItemResolver = class DatasetItemResolver extends server_1.ResolverBas
     }
     async DatasetItem(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Dataset Items', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwDatasetItems WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Dataset Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwDatasetItems] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Dataset Items', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Dataset Items', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
 };
 __decorate([
@@ -16775,13 +16929,15 @@ let ConversationDetailResolver = class ConversationDetailResolver extends server
     }
     async ConversationDetail(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Conversation Details', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwConversationDetails WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Conversation Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwConversationDetails] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Conversation Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Conversation Details', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ReportsArray(conversationdetail_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Reports', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE ConversationDetailID=${conversationdetail_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE [ConversationDetailID]=${conversationdetail_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Reports', await dataSource.query(sSQL));
+        return result;
     }
     async CreateConversationDetail(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -16799,11 +16955,9 @@ let ConversationDetailResolver = class ConversationDetailResolver extends server
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateConversationDetail(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -16830,9 +16984,10 @@ let ConversationDetailResolver = class ConversationDetailResolver extends server
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Conversation Details', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -16912,7 +17067,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], ConversationDetailResolver.prototype, "UpdateConversationDetail", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => ConversationDetail_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -17058,18 +17213,21 @@ let ConversationResolver = class ConversationResolver extends server_1.ResolverB
     }
     async Conversation(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Conversations', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwConversations WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Conversations', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwConversations] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Conversations', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Conversations', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ConversationDetailsArray(conversation_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Conversation Details', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwConversationDetails] WHERE ConversationID=${conversation_.ID} ` + this.getRowLevelSecurityWhereClause('Conversation Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwConversationDetails] WHERE [ConversationID]=${conversation_.ID} ` + this.getRowLevelSecurityWhereClause('Conversation Details', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Conversation Details', await dataSource.query(sSQL));
+        return result;
     }
     async ReportsArray(conversation_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Reports', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE ConversationID=${conversation_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwReports] WHERE [ConversationID]=${conversation_.ID} ` + this.getRowLevelSecurityWhereClause('Reports', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Reports', await dataSource.query(sSQL));
+        return result;
     }
     async CreateConversation(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -17087,11 +17245,9 @@ let ConversationResolver = class ConversationResolver extends server_1.ResolverB
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateConversation(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -17118,9 +17274,10 @@ let ConversationResolver = class ConversationResolver extends server_1.ResolverB
         if (await this.BeforeDelete(dataSource, ID)) {
             const entityObject = await new core_1.Metadata().GetEntityObject('Conversations', this.GetUserFromPayload(userPayload));
             await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll();
             if (await entityObject.Delete()) {
                 await this.AfterDelete(dataSource, ID);
-                return ID;
+                return returnValue;
             }
             else
                 return null;
@@ -17209,7 +17366,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], ConversationResolver.prototype, "UpdateConversation", null);
 __decorate([
-    (0, server_1.Mutation)(() => server_1.Int),
+    (0, server_1.Mutation)(() => Conversation_),
     __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
     __param(1, (0, server_1.Ctx)()),
     __param(2, (0, server_1.PubSub)()),
@@ -17407,8 +17564,9 @@ let UserNotificationResolver = class UserNotificationResolver extends server_1.R
     }
     async UserNotification(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('User Notifications', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwUserNotifications WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('User Notifications', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwUserNotifications] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('User Notifications', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('User Notifications', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateUserNotification(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -17426,11 +17584,9 @@ let UserNotificationResolver = class UserNotificationResolver extends server_1.R
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateUserNotification(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -17671,13 +17827,15 @@ let ResourceFolderResolver = class ResourceFolderResolver extends server_1.Resol
     }
     async ResourceFolder(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Resource Folders', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwResourceFolders WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Resource Folders', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwResourceFolders] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Resource Folders', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Resource Folders', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async ResourceFoldersArray(resourcefolder_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Resource Folders', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwResourceFolders] WHERE ParentID=${resourcefolder_.ID} ` + this.getRowLevelSecurityWhereClause('Resource Folders', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwResourceFolders] WHERE [ParentID]=${resourcefolder_.ID} ` + this.getRowLevelSecurityWhereClause('Resource Folders', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Resource Folders', await dataSource.query(sSQL));
+        return result;
     }
     async CreateResourceFolder(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -17695,11 +17853,9 @@ let ResourceFolderResolver = class ResourceFolderResolver extends server_1.Resol
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateResourceFolder(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -17922,8 +18078,9 @@ let SchemaInfoResolver = class SchemaInfoResolver extends server_1.ResolverBase
     }
     async SchemaInfo(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Schema Info', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwSchemaInfos WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Schema Info', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwSchemaInfos] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Schema Info', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Schema Info', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateSchemaInfo(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -17941,11 +18098,9 @@ let SchemaInfoResolver = class SchemaInfoResolver extends server_1.ResolverBase
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateSchemaInfo(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -18165,8 +18320,9 @@ let CompanyIntegrationRecordMapResolver = class CompanyIntegrationRecordMapResol
     }
     async CompanyIntegrationRecordMap(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Company Integration Record Maps', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwCompanyIntegrationRecordMaps WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Record Maps', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwCompanyIntegrationRecordMaps] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Company Integration Record Maps', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Company Integration Record Maps', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateCompanyIntegrationRecordMap(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -18184,11 +18340,9 @@ let CompanyIntegrationRecordMapResolver = class CompanyIntegrationRecordMapResol
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateCompanyIntegrationRecordMap(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -18492,13 +18646,15 @@ let RecordMergeLogResolver = class RecordMergeLogResolver extends server_1.Resol
     }
     async RecordMergeLog(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Record Merge Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwRecordMergeLogs WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwRecordMergeLogs] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Record Merge Logs', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async RecordMergeDeletionLogsArray(recordmergelog_, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Record Merge Deletion Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].[vwRecordMergeDeletionLogs] WHERE RecordMergeLogID=${recordmergelog_.ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Deletion Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL);
+        const sSQL = `SELECT * FROM [admin].[vwRecordMergeDeletionLogs] WHERE [RecordMergeLogID]=${recordmergelog_.ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Deletion Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.ArrayMapFieldNamesToCodeNames('Record Merge Deletion Logs', await dataSource.query(sSQL));
+        return result;
     }
     async CreateRecordMergeLog(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -18516,11 +18672,9 @@ let RecordMergeLogResolver = class RecordMergeLogResolver extends server_1.Resol
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateRecordMergeLog(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {
@@ -18744,8 +18898,9 @@ let RecordMergeDeletionLogResolver = class RecordMergeDeletionLogResolver extend
     }
     async RecordMergeDeletionLog(ID, { dataSource, userPayload }, pubSub) {
         this.CheckUserReadPermissions('Record Merge Deletion Logs', userPayload);
-        const sSQL = `SELECT * FROM [admin].vwRecordMergeDeletionLogs WHERE ID=${ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Deletion Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
-        return dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {});
+        const sSQL = `SELECT * FROM [admin].[vwRecordMergeDeletionLogs] WHERE [ID]=${ID} ` + this.getRowLevelSecurityWhereClause('Record Merge Deletion Logs', userPayload, core_1.EntityPermissionType.Read, 'AND');
+        const result = this.MapFieldNamesToCodeNames('Record Merge Deletion Logs', await dataSource.query(sSQL).then((r) => r && r.length > 0 ? r[0] : {}));
+        return result;
     }
     async CreateRecordMergeDeletionLog(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeCreate(dataSource, input)) {
@@ -18763,11 +18918,9 @@ let RecordMergeDeletionLogResolver = class RecordMergeDeletionLogResolver extend
             return null;
     }
     async BeforeCreate(dataSource, input) {
-        const i = input, d = dataSource;
         return true;
     }
     async AfterCreate(dataSource, input) {
-        const i = input, d = dataSource;
     }
     async UpdateRecordMergeDeletionLog(input, { dataSource, userPayload }, pubSub) {
         if (await this.BeforeUpdate(dataSource, input)) {