Skip to content

fix(types): change raw query return type to [unknown[],unknown] #11368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sushantdhiman merged 6 commits into from
Aug 30, 2019
Merged

fix(types): change raw query return type to [unknown[],unknown] #11368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e2d28ef
fix(types): change raw query return type to [unknown[],unknown]
Aug 28, 2019
9686e17
fix(types): increase test coverage for raw query return type
Aug 28, 2019
6137790
fix(types): removed unecessary test code
Aug 28, 2019
861530a
fix(types): fixed test code
Aug 28, 2019
9314d07
fix(types): making test more explicit
Aug 29, 2019
eb45a4a
Merge branch 'master' into master
jpollard-cs Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion types/lib/sequelize.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ export class Sequelize extends Hooks {
options: QueryOptionsWithModel
): Promise<M[]>;
public query<T extends object>(sql: string | { query: string; values: unknown[] }, options: QueryOptionsWithType<QueryTypes.SELECT>): Promise<T[]>;
public query(sql: string | { query: string; values: unknown[] }, options?: QueryOptions | QueryOptionsWithType<QueryTypes.RAW>): Promise<unknown[]>;
public query(sql: string | { query: string; values: unknown[] }, options?: QueryOptions | QueryOptionsWithType<QueryTypes.RAW>): Promise<[unknown[], unknown]>;

/**
* Get the fn for random based on the dialect
Expand Down
10 changes: 8 additions & 2 deletions types/test/sequelize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Config, Sequelize, Model } from 'sequelize';
import { Config, Sequelize, Model, QueryTypes } from 'sequelize';
import { Fn } from '../lib/utils';

Sequelize.useCLS({
Expand Down Expand Up @@ -53,4 +53,10 @@ class Model1 extends Model{}
class Model2 extends Model{}
const myModel: typeof Model1 = sequelize.models.asd;
myModel.hasOne(Model2)
myModel.findAll();
myModel.findAll();

sequelize.query('SELECT * FROM `user`', { type: QueryTypes.RAW }).then(result => {
const data = result[0];
const arraysOnly = (a: any[]) => a;
arraysOnly(data);
});
Comment thread
jpollard-cs marked this conversation as resolved.