Skip to content

Commit

Permalink
support Postgres10 FLOAT/REAL (#10711)
Browse files Browse the repository at this point in the history
Co-authored-by: Jay Cammarano <jaycammarano@gmail.com>
  • Loading branch information
jamescammarano and Jay Cammarano committed Dec 27, 2021
1 parent 859d30f commit b1c2818
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 28 deletions.
36 changes: 10 additions & 26 deletions tests/e2e/api/items/many-to-many.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import config from '../../config';
import { getDBsToTest } from '../../get-dbs-to-test';
import knex, { Knex } from 'knex';
import { createArtist, createEvent, createMany, seedTable, Item } from '../../setup/utils/factories';

describe('/items', () => {
const databases = new Map<string, Knex>();

Expand Down Expand Up @@ -122,16 +123,10 @@ describe('/items', () => {
expect(await databases.get(vendor)!('artists').select('name').where('id', artist.id)).toMatchObject([
{ name: artist.name },
]);
if (vendor === 'postgres10') {
const cost = Math.round(event.cost * 10) / 10;
expect(await databases.get(vendor)!('events').select('cost').where('id', event.id)).toMatchObject([
{ cost: cost },
]);
} else {
expect(await databases.get(vendor)!('events').select('cost').where('id', event.id)).toMatchObject([
{ cost: event.cost },
]);
}

expect(await databases.get(vendor)!('events').select('cost').where('id', event.id)).toMatchObject([
{ cost: event.cost },
]);
});
});
describe('/:collection GET', () => {
Expand Down Expand Up @@ -258,16 +253,9 @@ describe('/items', () => {
},
});
for (let row = 0; row < response.data.data.length; row++) {
if (vendor === 'postgres10') {
const cost = Math.round(event.cost * 10) / 10;
expect(response.data.data[row].events_id).toMatchObject({
cost: cost,
});
} else {
expect(response.data.data[row].events_id).toMatchObject({
cost: event.cost,
});
}
expect(response.data.data[row].events_id).toMatchObject({
cost: event.cost,
});
}
expect(response.data.data.length).toBe(keys.length);
});
Expand Down Expand Up @@ -314,12 +302,8 @@ describe('/items', () => {
expect(await databases.get(vendor)!('artists_events').select('*').where('id', items[row].id)).toStrictEqual([]);
}
expect((await databases.get(vendor)!('artists').select('name').where('id', artist.id))[0].name).toBe(artist.name);
if (vendor === 'postgres10') {
const cost = Math.round(event.cost * 10) / 10;
expect((await databases.get(vendor)!('events').select('cost').where('id', event.id))[0].cost).toBe(cost);
} else {
expect((await databases.get(vendor)!('events').select('cost').where('id', event.id))[0].cost).toBe(event.cost);
}

expect((await databases.get(vendor)!('events').select('cost').where('id', event.id))[0].cost).toBe(event.cost);
});
});
});
2 changes: 1 addition & 1 deletion tests/e2e/setup/seeds/04_directus_users.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const generateHash = require('../utils/generateHash');
const generateHash = require('../utils/setup-utils');

exports.seed = async function (knex) {
return await knex('directus_users').insert([
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/setup/utils/factories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export const createArtist = (): Artist => ({

export const createEvent = (): Event => ({
id: uuid(),
cost: datatype.float(),
cost: datatype.number(),
description: lorem.paragraphs(2),
created_at: randomDateTime(new Date(1030436120350), new Date(1633466120350)),
time: randomTime(),
Expand Down
File renamed without changes.

0 comments on commit b1c2818

Please sign in to comment.