drizzle-orm 0.22.0-d6d3081 → 0.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -3
- package/package.json +1 -1
- package/pg-core/columns/array.js +1 -1
- package/pg-core/columns/array.js.map +1 -1
- package/sql/index.js +2 -2
- package/sql/index.js.map +1 -1
package/README.md
CHANGED
|
@@ -23,19 +23,22 @@ Drizzle ORM is being battle-tested on production projects by multiple teams 🚀
|
|
|
23
23
|
- Best in class fully typed joins
|
|
24
24
|
- Fully typed partial and non-partial selects of any complexity
|
|
25
25
|
- Auto-inferring of TS types for DB models for selections and insertions separately
|
|
26
|
+
- [Zod schema generation](/drizzle-zod/README.md)
|
|
26
27
|
- Zero dependencies
|
|
27
28
|
|
|
28
29
|
## Supported databases
|
|
29
30
|
|
|
30
31
|
| Database | Status | |
|
|
31
32
|
|:------------|:-------:|:---|
|
|
32
|
-
| PostgreSQL | ✅
|
|
33
|
+
| PostgreSQL | ✅ | [Docs](./drizzle-orm/src/pg-core/README.md)|
|
|
33
34
|
| MySQL | ✅ |[Docs](./drizzle-orm/src/mysql-core/README.md)|
|
|
34
35
|
| SQLite | ✅ |[Docs](./drizzle-orm/src/sqlite-core/README.md)|
|
|
36
|
+
| [Cloudflare D1](https://developers.cloudflare.com/d1) | ✅ | [Docs](./examples/cloudflare-d1/README.md) |
|
|
35
37
|
| DynamoDB | ⏳ | |
|
|
36
38
|
| MS SQL | ⏳ | |
|
|
37
39
|
| CockroachDB | ⏳ | |
|
|
38
40
|
|
|
41
|
+
|
|
39
42
|
## Installation
|
|
40
43
|
|
|
41
44
|
```bash
|
|
@@ -86,13 +89,13 @@ const newUser: NewUser = {
|
|
|
86
89
|
fullName: 'John Doe',
|
|
87
90
|
phone: '+123456789',
|
|
88
91
|
};
|
|
89
|
-
const insertedUsers /* : User */ = await db.insert(users).values(newUser).returning();
|
|
92
|
+
const insertedUsers /* : User[] */ = await db.insert(users).values(newUser).returning();
|
|
90
93
|
const insertedUser = insertedUsers[0]!;
|
|
91
94
|
|
|
92
95
|
const newCity: NewCity = {
|
|
93
96
|
name: 'New York',
|
|
94
97
|
};
|
|
95
|
-
const insertedCities /* : City */ = await db.insert(cities).values(newCity).returning();
|
|
98
|
+
const insertedCities /* : City[] */ = await db.insert(cities).values(newCity).returning();
|
|
96
99
|
const insertedCity = insertedCities[0]!;
|
|
97
100
|
|
|
98
101
|
// Update
|
package/package.json
CHANGED
package/pg-core/columns/array.js
CHANGED
|
@@ -46,7 +46,7 @@ class PgArray extends common_1.PgColumn {
|
|
|
46
46
|
return value.map((v) => this.baseColumn.mapFromDriverValue(v));
|
|
47
47
|
}
|
|
48
48
|
mapToDriverValue(value) {
|
|
49
|
-
return value.map((v) => this.baseColumn.mapToDriverValue(v));
|
|
49
|
+
return value.map((v) => v === null ? null : this.baseColumn.mapToDriverValue(v));
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
exports.PgArray = PgArray;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../src/pg-core/columns/array.ts"],"names":[],"mappings":";;;AAIA,qCAAqD;AAarD,MAAa,cAA+C,SAAQ,wBAanE;IAGA,YACC,IAAY,EACZ,WAAuD,EACvD,IAAwB;QAExB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IACzB,CAAC;IAEQ,OAAO;QACf,OAAO,KAAK,CAAC,OAAO,EAAS,CAAC;IAC/B,CAAC;IAEQ,OAAO,CAAC,KAAsB;QACtC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAQ,CAAC;IACpC,CAAC;IAEQ,UAAU;QAClB,OAAO,KAAK,CAAC,UAAU,EAAS,CAAC;IAClC,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAAuC;QAEvC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACxD,OAAO,IAAI,OAAO,CAAkE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACrH,CAAC;CACD;AA7CD,wCA6CC;AAED,MAAa,OAAiC,SAAQ,iBAQrD;IAKA,YACC,KAA2C,EACnC,MAAsD,EACrD,UAMP,EACO,KAAgD;QAEzD,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAVb,WAAM,GAAN,MAAM,CAAgD;QACrD,eAAU,GAAV,UAAU,CAMjB;QACO,UAAK,GAAL,KAAK,CAA2C;QAGzD,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,EAAE,CAAC,KAAa;QAOf,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,KAAsC;QAC3C,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,OAAO,IAAI,OAAO,CAAI,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,UAAU;QACT,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IAC7F,CAAC;IAEQ,kBAAkB,CAAC,KAAuB;QAClD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC;IAEQ,gBAAgB,CAAC,KAAgB;QACzC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../src/pg-core/columns/array.ts"],"names":[],"mappings":"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"}
|
package/sql/index.js
CHANGED
|
@@ -65,7 +65,7 @@ class SQL {
|
|
|
65
65
|
: escapeName(viewName);
|
|
66
66
|
}
|
|
67
67
|
if (chunk instanceof Param) {
|
|
68
|
-
const mappedValue = chunk.encoder.mapToDriverValue(chunk.value);
|
|
68
|
+
const mappedValue = chunk.value === null ? null : chunk.encoder.mapToDriverValue(chunk.value);
|
|
69
69
|
if (mappedValue instanceof SQL) {
|
|
70
70
|
const mappedValueQuery = mappedValue.toQuery(Object.assign(Object.assign({}, config), { paramStartIndex: paramStartIndex + params.length, inlineParams: this.shouldInlineParams || config.inlineParams }));
|
|
71
71
|
params.push(...mappedValueQuery.params);
|
|
@@ -95,7 +95,7 @@ class SQL {
|
|
|
95
95
|
}
|
|
96
96
|
throw new Error('Unexpected param value: ' + mappedValue);
|
|
97
97
|
}
|
|
98
|
-
params.push(
|
|
98
|
+
params.push(mappedValue);
|
|
99
99
|
if (typeof prepareTyping !== 'undefined')
|
|
100
100
|
typings.push(prepareTyping(chunk.encoder));
|
|
101
101
|
return escapeParam(paramStartIndex + params.length - 1, chunk.value);
|
package/sql/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/sql/index.ts"],"names":[],"mappings":"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"}
|