fix(policy): extra fields included for policy evaluation should be dropped upon return (#2286)

Author: ymc9

packages/runtime/src/enhancements/node/policy/policy-utils.ts

@@ -1528,12 +1528,24 @@ export class PolicyUtil extends QueryUtils {
                     continue;
                 }
 
-                if (queryArgs?.omit?.[field] === true) {
+                if (queryArgs?.omit && typeof queryArgs.omit === 'object' && queryArgs.omit[field] === true) {
                     // respect `{ omit: { [field]: true } }`
                     delete entityData[field];
                     continue;
                 }
 
+                if (queryArgs?.select && typeof queryArgs.select === 'object' && !queryArgs.select[field]) {
+                    // respect select
+                    delete entityData[field];
+                    continue;
+                }
+
+                if (fieldInfo.isDataModel && queryArgs?.include && typeof queryArgs.include === 'object' && !queryArgs.include[field]) {
+                    // respect include
+                    delete entityData[field];
+                    continue;
+                }
+
                 if (hasFieldLevelPolicy) {
                     // 1. remove fields selected for checking field-level policies but not selected by the original query args
                     // 2. evaluate field-level policies and remove fields that are not readable

packages/testtools/src/schema.ts

@@ -150,6 +150,7 @@ export type SchemaLoadOptions = {
     prismaLoadPath?: string;
     prismaClientOptions?: object;
     generateNoCompile?: boolean;
+    dbFile?: string;
 };
 
 const defaultOptions: SchemaLoadOptions = {
@@ -337,7 +338,10 @@ export function createProjectAndCompile(schema: string, options: SchemaLoadOptio
         });
     }
 
-    if (opt.pushDb) {
+    if (opt.dbFile) {
+        fs.cpSync(opt.dbFile, path.join(projectDir, 'prisma/dev.db'));
+    }
+    else if (opt.pushDb) {
         run('npx prisma db push --skip-generate --accept-data-loss');
     }