Skip to content

Commit

Permalink
feat(client): distinct queries
Browse files Browse the repository at this point in the history
Closes #2835
  • Loading branch information
timsuchanek committed Jul 14, 2020
1 parent 4f0e12c commit 9563033
Show file tree
Hide file tree
Showing 14 changed files with 233 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"preinstall": "node -e \"!process.env.npm_config_user_agent.startsWith('pnpm/') && !console.log('Use pnpm install to install dependencies in this repository\\n') && process.exit(1)\"",
"setup": "ts-node scripts/setup.ts",
"build": "ts-node scripts/setup.ts --build",
"download": "pnpm --prefix=./packages/engine-core/ run download && pnpm --prefix=./packages/client/ run download && pnpm --prefix=./packages/sdk/ run download && pnpm --prefix=./packages/migrate/ run download",
"download-all": "pnpm recursive run download",
"dry": "ts-node scripts/ci/publish.ts --dry-run",
"publish-all": "ts-node scripts/ci/publish.ts --publish",
"test": "ts-node scripts/ci/publish.ts --test",
Expand Down
4 changes: 2 additions & 2 deletions src/packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"prisma2": "build/index.js"
},
"prisma": {
"version": "832e37683666c748b0a1cbdc2c5068b5e443e816",
"version": "b032e1220061befb095deef6f8ee2e36bacbf4d9",
"prismaCommit": "a5eb191258a8d8b5d3b99602e5d425fd1748df6c"
},
"devDependencies": {
Expand Down Expand Up @@ -156,4 +156,4 @@
"eslint"
]
}
}
}
38 changes: 21 additions & 17 deletions src/packages/client/fixtures/blog/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,28 @@ async function main() {
// const result = await prisma.user.count({
// take: 10,
// })
const result = await prisma.user.aggregate({
avg: {
age: true
},
max: {
age: true
},
sum: {
age: true
},
min: {
age: true
},
count: true
// const result = await prisma.user.aggregate({
// avg: {
// age: true
// },
// max: {
// age: true
// },
// sum: {
// age: true
// },
// min: {
// age: true
// },
// count: true
// })
// result.count
// result.avg.age
// console.log(result)
const res = await prisma.user.findMany({
distinct: ['age'],
})
result.count
result.avg.age
console.log(result)
console.log(res)
prisma.disconnect()
}

Expand Down
2 changes: 1 addition & 1 deletion src/packages/client/fixtures/blog/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ datasource db {
generator client {
provider = "prisma-client-js"
binaryTargets = ["native"]
experimentalFeatures = ["connectOrCreate", "aggregateApi"]
experimentalFeatures = ["connectOrCreate", "aggregateApi", "distinct"]
}

model User {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!dev.db
Binary file not shown.
25 changes: 25 additions & 0 deletions src/packages/client/src/__tests__/runtime-tests/distinct/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
const { PrismaClient } = require('@prisma/client')
const assert = require('assert')

module.exports = async () => {
const prisma = new PrismaClient()

let result = await prisma.user.findMany({
distinct: ['id'], // distinct on id has no effect, as it's distinct anyway
})

assert.equal(result.length, 10)

result = await prisma.user.findMany({
distinct: ['name'],
})

assert.equal(result.length, 10)

prisma.disconnect()
}

if (require.main === module) {
// seed()
module.exports()
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"shouldSucceed": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
datasource db {
provider = "sqlite"
url = "file:dev.db"
default = true
}

generator client {
provider = "prisma-client-js"
experimentalFeatures = ["distinct"]
}

// / User model comment
model User {
id String @default(uuid()) @id
email String @unique
age Int
// / name comment
name String?
posts Post[]
}

model Post {
id String @default(cuid()) @id
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
published Boolean
title String
content String?
authorId String?
author User? @relation(fields: [authorId], references: [id])
}
22 changes: 22 additions & 0 deletions src/packages/client/src/__tests__/types/distinct/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { PrismaClient } from '@prisma/client'

// tslint:disable

// This file will not be executed, just compiled to check if the typings are valid
async function main() {
const prisma = new PrismaClient({
datasources: {
db: {
url: 'file:dev.db',
},
},
})

await prisma.user.findMany({
distinct: ['id', 'email', 'age', 'followerCount', 'name'],
})
}

main().catch((e) => {
console.error(e)
})
60 changes: 60 additions & 0 deletions src/packages/client/src/__tests__/types/distinct/schema.prisma
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
datasource db {
provider = "postgres"
url = env("SOME_DB")
}

generator client {
provider = "prisma-client-js"
output = "@prisma/client"
experimentalFeatures = ["distinct"]
}

// / User model comment
model User {
id String @default(uuid()) @id
email String @unique
age Int
followerCount Int?
// / name comment
name String?
posts Post[]
Like Like[]
}

model Post {
id String @default(cuid()) @id
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
published Boolean
title String
content String?
authorId String?
author User? @relation(fields: [authorId], references: [id])
Like Like[]
}

enum Role {
USER
ADMIN
}

model MachineData {
id String @default(cuid()) @id
machineId String
os String
osVersion Float
osArch String
procFreq Float
procCores Int
ram Int
}

model Like {
id String @default(cuid()) @id
userId String
user User @relation(fields: [userId], references: [id])
postId String
post Post @relation(fields: [postId], references: [id])
@@unique([userId, postId])
}
63 changes: 63 additions & 0 deletions src/packages/client/src/__tests__/types/distinct/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"compilerOptions": {
/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "es2018" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */,
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */,
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
// "declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
// "outDir": "./", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */

/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */

/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */

/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */

/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
}
}
4 changes: 2 additions & 2 deletions src/packages/fetch-engine/src/getLatestTag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,14 @@ async function urlExists(url) {

const headers = fromEntries(res.headers.entries())
if (res.status > 200) {
console.error(res, headers)
// console.error(res, headers)
}
if (parseInt(headers['content-length']) > 0) {
return res.status < 300
}
} catch (e) {
//
console.error(e)
// console.error(e)
}
return false
}
Expand Down
2 changes: 1 addition & 1 deletion src/packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"scripts"
],
"prisma": {
"version": "81e452517f2e53825001cddd130dc09e0862711b"
"version": "b032e1220061befb095deef6f8ee2e36bacbf4d9"
},
"devDependencies": {
"@types/jest": "25.2.3",
Expand Down

0 comments on commit 9563033

Please sign in to comment.