archive-gh-me/typeorm
1
0
Fork 0
mirror of https://github.com/typeorm/typeorm.git synced 2025-12-08 21:26:23 +00:00
Code Issues Projects Releases Wiki Activity

revert: json/jsonb change introduced in 0.3.1 (#8777)

Browse Source
This commit is contained in:
Umed Khudoiberdiev 2022-03-22 23:04:41 +05:00 committed by GitHub
parent 05fc744469
commit edf27d97a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 114 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/postgres/PostgresDriver.ts
View File

@ -622,7 +622,7 @@ export class PostgresDriver implements Driver {
columnMetadata.type,
) >= 0
) {
return value // JSON.stringify()
return JSON.stringify(value)
} else if (columnMetadata.type === "hstore") {
if (typeof value === "string") {
return value

2
test/benchmark/bulk-save-case2/entity/Document.ts
View File

@ -16,7 +16,7 @@ export class Document {
@Column("text")
context: string
@Column({ type: "jsonb", array: true })
@Column({ type: "jsonb" })
distributions: Distribution[]
@Column({ type: "timestamp with time zone" })

89
test/functional/find-options/array-contained-by-operator/array-contained-by-operator.test.ts
View File

@ -25,21 +25,18 @@ describe("find options > find operators > ArrayContainedBy", () => {
const post1 = new Post()
post1.title = "Post #1"
post1.authors = ["dmitry", "olimjon"]
post1.categories = [{ name: "typescript" }, { name: "programming" }]
post1.statuses = [PostStatus.draft, PostStatus.published]
await manager.save(post1)
const post2 = new Post()
post2.title = "Post #2"
post2.authors = ["olimjon"]
post2.categories = [{ name: "programming" }]
post2.statuses = [PostStatus.published]
await manager.save(post2)
const post3 = new Post()
post3.title = "Post #3"
post3.authors = []
post3.categories = []
post3.statuses = []
await manager.save(post3)
}
@ -62,24 +59,18 @@ describe("find options > find operators > ArrayContainedBy", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
{
id: 3,
title: "Post #3",
authors: [],
categories: [],
statuses: [],
},
])
@ -97,84 +88,12 @@ describe("find options > find operators > ArrayContainedBy", () => {
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
{
id: 3,
title: "Post #3",
authors: [],
categories: [],
statuses: [],
},
])
}),
))
it("should find entries in jsonb", () =>
Promise.all(
connections.map(async (connection) => {
await prepareData(connection.manager)
const loadedPost1 = await connection.manager.find(Post, {
where: {
categories: ArrayContainedBy([
{ name: "typescript" },
{ name: "programming" },
]),
},
order: {
id: "asc",
},
})
loadedPost1.should.be.eql([
{
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
{
id: 3,
title: "Post #3",
authors: [],
categories: [],
statuses: [],
},
])
const loadedPost2 = await connection.manager.find(Post, {
where: {
categories: ArrayContainedBy([{ name: "programming" }]),
},
order: {
id: "asc",
},
})
loadedPost2.should.be.eql([
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
{
id: 3,
title: "Post #3",
authors: [],
categories: [],
statuses: [],
},
])
@ -202,24 +121,18 @@ describe("find options > find operators > ArrayContainedBy", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
{
id: 3,
title: "Post #3",
authors: [],
categories: [],
statuses: [],
},
])
@ -237,14 +150,12 @@ describe("find options > find operators > ArrayContainedBy", () => {
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
{
id: 3,
title: "Post #3",
authors: [],
categories: [],
statuses: [],
},
])

6
test/functional/find-options/array-contained-by-operator/entity/Post.ts
View File

@ -24,12 +24,6 @@ export class Post {
})
authors: string[]
@Column({
type: "jsonb",
array: true,
})
categories: PostCategory[]
@Column({
type: "enum",
enum: PostStatus,

77
test/functional/find-options/array-contains-operator/array-contains-operator.test.ts
View File

@ -25,21 +25,18 @@ describe("find options > find operators > ArrayContains", () => {
const post1 = new Post()
post1.title = "Post #1"
post1.authors = ["dmitry", "olimjon"]
post1.categories = [{ name: "typescript" }, { name: "programming" }]
post1.statuses = [PostStatus.draft, PostStatus.published]
await manager.save(post1)
const post2 = new Post()
post2.title = "Post #2"
post2.authors = ["olimjon"]
post2.categories = [{ name: "programming" }]
post2.statuses = [PostStatus.published]
await manager.save(post2)
const post3 = new Post()
post3.title = "Post #3"
post3.authors = []
post3.categories = []
post3.statuses = []
await manager.save(post3)
}
@ -62,10 +59,6 @@ describe("find options > find operators > ArrayContains", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
])
@ -83,73 +76,12 @@ describe("find options > find operators > ArrayContains", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
])
}),
))
it("should find entries in jsonb", () =>
Promise.all(
connections.map(async (connection) => {
await prepareData(connection.manager)
const loadedPost1 = await connection.manager.find(Post, {
where: {
categories: ArrayContains([{ name: "typescript" }]),
},
order: {
id: "asc",
},
})
loadedPost1.should.be.eql([
{
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
])
const loadedPost2 = await connection.manager.find(Post, {
where: {
categories: ArrayContains([{ name: "programming" }]),
},
order: {
id: "asc",
},
})
loadedPost2.should.be.eql([
{
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
])
@ -174,10 +106,6 @@ describe("find options > find operators > ArrayContains", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
])
@ -195,17 +123,12 @@ describe("find options > find operators > ArrayContains", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
])

6
test/functional/find-options/array-contains-operator/entity/Post.ts
View File

@ -24,12 +24,6 @@ export class Post {
})
authors: string[]
@Column({
type: "jsonb",
array: true,
})
categories: PostCategory[]
@Column({
type: "enum",
enum: PostStatus,

83
test/functional/find-options/array-overlap/array-overlap-operator.test.ts
View File

@ -25,21 +25,18 @@ describe("find options > find operators > ArrayOverlap", () => {
const post1 = new Post()
post1.title = "Post #1"
post1.authors = ["dmitry", "olimjon"]
post1.categories = [{ name: "typescript" }, { name: "programming" }]
post1.statuses = [PostStatus.draft, PostStatus.published]
await manager.save(post1)
const post2 = new Post()
post2.title = "Post #2"
post2.authors = ["olimjon"]
post2.categories = [{ name: "programming" }]
post2.statuses = [PostStatus.published]
await manager.save(post2)
const post3 = new Post()
post3.title = "Post #3"
post3.authors = []
post3.categories = []
post3.statuses = []
await manager.save(post3)
}
@ -62,10 +59,6 @@ describe("find options > find operators > ArrayOverlap", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
])
@ -83,79 +76,12 @@ describe("find options > find operators > ArrayOverlap", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
])
}),
))
it("should find entries in jsonb", () =>
Promise.all(
connections.map(async (connection) => {
await prepareData(connection.manager)
const loadedPost1 = await connection.manager.find(Post, {
where: {
categories: ArrayOverlap([
{ name: "typescript" },
{ name: "python" },
]),
},
order: {
id: "asc",
},
})
loadedPost1.should.be.eql([
{
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
])
const loadedPost2 = await connection.manager.find(Post, {
where: {
categories: ArrayOverlap([
{ name: "programming" },
{ name: "python" },
]),
},
order: {
id: "asc",
},
})
loadedPost2.should.be.eql([
{
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
])
@ -183,10 +109,6 @@ describe("find options > find operators > ArrayOverlap", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
])
@ -207,17 +129,12 @@ describe("find options > find operators > ArrayOverlap", () => {
id: 1,
title: "Post #1",
authors: ["dmitry", "olimjon"],
categories: [
{ name: "typescript" },
{ name: "programming" },
],
statuses: [PostStatus.draft, PostStatus.published],
},
{
id: 2,
title: "Post #2",
authors: ["olimjon"],
categories: [{ name: "programming" }],
statuses: [PostStatus.published],
},
])

6
test/functional/find-options/array-overlap/entity/Post.ts
View File

@ -24,12 +24,6 @@ export class Post {
})
authors: string[]
@Column({
type: "jsonb",
array: true,
})
categories: PostCategory[]
@Column({
type: "enum",
enum: PostStatus,

12
test/functional/json/jsonb.ts → test/functional/json/basic-jsonb/basic-jsonb.test.ts
View File

@ -1,12 +1,12 @@
import "../../utils/test-setup"
import "../../../utils/test-setup"
import { expect } from "chai"
import { Record } from "./entity/Record"
import { DataSource } from "../../../src"
import { DataSource } from "../../../../src"
import {
closeTestingConnections,
createTestingConnections,
reloadTestingDatabases,
} from "../../utils/test-utils"
} from "../../../utils/test-utils"
describe("jsonb type", () => {
let connections: DataSource[]
@ -86,7 +86,7 @@ describe("jsonb type", () => {
connections.map(async (connection) => {
let recordRepo = connection.getRepository(Record)
let record = new Record()
record.data = `"foo"`
record.data = `foo`
let persistedRecord = await recordRepo.save(record)
let foundRecord = await recordRepo.findOneBy({
id: persistedRecord.id,
@ -102,13 +102,13 @@ describe("jsonb type", () => {
connections.map(async (connection) => {
let recordRepo = connection.getRepository(Record)
let record = new Record()
record.data2 = [1, `"2"`, { a: 3 }]
record.data = [1, `2`, { a: 3 }]
let persistedRecord = await recordRepo.save(record)
let foundRecord = await recordRepo.findOneBy({
id: persistedRecord.id,
})
expect(foundRecord).to.be.not.undefined
expect(foundRecord!.data2).to.deep.include.members([
expect(foundRecord!.data).to.deep.include.members([
1,
"2",
{ a: 3 },

5
test/functional/json/entity/Record.ts → test/functional/json/basic-jsonb/entity/Record.ts
View File

@ -1,4 +1,4 @@
import { Column, Entity, PrimaryGeneratedColumn } from "../../../../src"
import { Column, Entity, PrimaryGeneratedColumn } from "../../../../../src"
/**
* For testing Postgres jsonb
@ -14,9 +14,6 @@ export class Record {
@Column({ type: "jsonb", nullable: true })
data: any
@Column({ type: "jsonb", nullable: true, array: true })
data2: any
@Column({
type: "jsonb",
nullable: true,

32
test/functional/json/jsonb-defaults/entity/Post.ts Normal file
View File

@ -0,0 +1,32 @@
import { Column, Entity, PrimaryGeneratedColumn } from "../../../../../src"
export type PostCategory = {
name: string
}
@Entity()
export class Post {
@PrimaryGeneratedColumn()
id: number
@Column()
title: string
@Column({
type: "jsonb",
default: ["Dmitry", "Olimjon"],
})
authors: string[]
@Column({
type: "jsonb",
default: { name: "TypeScript" },
})
category: PostCategory
@Column({
type: "jsonb",
default: [{ name: "TypeScript" }],
})
categories: PostCategory[]
}

70
test/functional/json/jsonb-defaults/jsonb-defaults.test.ts Normal file
View File

@ -0,0 +1,70 @@
import "../../../utils/test-setup"
import { Post } from "./entity/Post"
import { DataSource } from "../../../../src"
import {
closeTestingConnections,
createTestingConnections,
reloadTestingDatabases,
} from "../../../utils/test-utils"
describe("json > defaults", () => {
let connections: DataSource[]
before(
async () =>
(connections = await createTestingConnections({
entities: [Post],
enabledDrivers: ["postgres"], // because only postgres supports jsonb type
// logging: true,
})),
)
beforeEach(() => reloadTestingDatabases(connections))
after(() => closeTestingConnections(connections))
it("should insert default values properly", () =>
Promise.all(
connections.map(async (connection) => {
const post1 = new Post()
post1.title = "Post #1"
await connection.manager.save(post1)
const loadedPost1 = await connection.manager.findBy(Post, {
title: "Post #1",
})
loadedPost1.should.be.eql([
{
id: 1,
title: "Post #1",
authors: ["Dmitry", "Olimjon"],
category: { name: "TypeScript" },
categories: [{ name: "TypeScript" }],
},
])
const post2 = new Post()
post2.title = "Post #2"
post2.authors = [`Umed`, `Dmitry`]
post2.category = { name: "JavaScript" }
post2.categories = [
{ name: "JavaScript" },
{ name: "ECMAScript" },
]
await connection.manager.save(post2)
const loadedPost2 = await connection.manager.findBy(Post, {
title: "Post #2",
})
loadedPost2.should.be.eql([
{
id: 2,
title: "Post #2",
authors: ["Umed", "Dmitry"],
category: { name: "JavaScript" },
categories: [
{ name: "JavaScript" },
{ name: "ECMAScript" },
],
},
])
}),
))
})

4
test/github-issues/204/entity/Record.ts
View File

@ -7,9 +7,9 @@ export class Record {
@PrimaryGeneratedColumn()
id: number
@Column({ type: "json", array: true })
@Column({ type: "json" })
configs: RecordConfig[]
@Column({ type: "jsonb", array: true })
@Column({ type: "jsonb" })
datas: RecordData[]
}

2
test/github-issues/3496/entity/Post.ts
View File

@ -10,6 +10,6 @@ export class Post {
@VersionColumn()
version: number
@Column({ type: "jsonb", array: true })
@Column({ type: "jsonb" })
problems: object
}