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.

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

fixes 2630 #2642

Merged
merged 1 commit into from Jun 5, 2018

Conversation

Projects
None yet
3 participants
@koskimas
Collaborator

koskimas commented Jun 2, 2018

This PR fixes the issue #2630 for postgres

@@ -246,7 +246,8 @@ assign(Client_PG.prototype, {
if (returning === '*' || Array.isArray(returning)) {
returns[i] = row;
} else {
returns[i] = row[returning];
// Pluck the only column in the row.
returns[i] = row[Object.keys(row)[0]];

This comment has been minimized.

@koskimas

koskimas Jun 2, 2018

Collaborator

All other dialects that support returning already do it like this.

@kibertoad

This comment has been minimized.

Collaborator

kibertoad commented Jun 2, 2018

@koskimas Oracle seems to be failing.

@koskimas

This comment has been minimized.

Collaborator

koskimas commented Jun 2, 2018

The oracle query compiler seems to be borked and it has nothing to do with this PR. I'm not familiar with oracle but this cannot be valid SQL:

insert into accounts (balance) values (:1) returning balance into :2

There are two into statements. @elhigu Any ideas? This seems like a separate issue since I only changed postgres dialect. Should I just disable my test for oracle?

@kibertoad

This comment has been minimized.

Collaborator

kibertoad commented Jun 2, 2018

@koskimas What problem do you see with this SQL? Two "into" per se are not invalid.

From what I gather, correct syntax is like this:

var tmp number;
BEGIN
  insert into users(name,sur) 
  values('Jane','Doe')
  returning id into :tmp;
END;

see https://stackoverflow.com/questions/39797986/what-exactly-does-returning-into-do-in-oracle-sql
You return into local variable in Oracle world.

@koskimas

This comment has been minimized.

Collaborator

koskimas commented Jun 2, 2018

Ok.. I have no idea what's going on with oracle here, and since I don't have oracle installed on my machine, I have no way to debug it. The last time I tried to install oracle on my arch linux box, I gave up after couple of hours. So if someone else doesn't look into this, I'll have to cancel this PR.

@kibertoad

This comment has been minimized.

Collaborator

kibertoad commented Jun 2, 2018

@koskimas Since you haven't changed anything about Oracle, can't you add ToDo comment into your test and just not run the test on it?

@koskimas

This comment has been minimized.

Collaborator

koskimas commented Jun 2, 2018

I can do that. I don't know if anyone will merge a partial fix, but let's see 😄

@kibertoad

This comment has been minimized.

Collaborator

kibertoad commented Jun 2, 2018

Given that PostgreSQL userbase in JS world is much larger than the Oracle one, I would think that rejecting an improvement on such grounds would be insane.
If someone from Oracle world ever encounters this issue, he would be definitely much more well-prepared to tackle it himself and improve on this :).

@koskimas

This comment has been minimized.

Collaborator

koskimas commented Jun 4, 2018

@elhigu What do you think about merging this?

@elhigu

elhigu approved these changes Jun 5, 2018

All good here, sorry for the delay. I've been trying to not look these issues while fixing mssql tests...

}
};
// Remove `_foo` from the end of each identifier.

This comment has been minimized.

@elhigu

elhigu Jun 5, 2018

Collaborator

Symmetric transformation which removes and then re-creates suffix is not ideal to do here, since someone might just break calling wrap / postprocess altogether and test wouldn't know difference or someone may accidentally remove place where handlers are overwritten and still test runs fine.

Also I had to went to look into handler code after checking the test code and wondering why keys weren't transformed to anything :)

This comment has been minimized.

@koskimas

koskimas Jun 5, 2018

Collaborator

Shouldn't there be another test that tests whether the functions are called at all? This test only test if the functions are called correctly provided that the feature works.

This comment has been minimized.

@elhigu

elhigu Jun 5, 2018

Collaborator

Yeah, ofc there are few other tests testing that those are called, though it won't protect from those other things mentioned that these tests would still work fine even if someone moves just it parts outside of this describe. Anyways it really doesn't matter much, since someone may also easily delete all the tests by accident.

@elhigu elhigu merged commit 1c65e69 into tgriesser:master Jun 5, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@elhigu

This comment has been minimized.

Collaborator

elhigu commented Jun 5, 2018

thanks!

@koskimas koskimas deleted the koskimas:fix-2630 branch Jun 5, 2018

@koskimas

This comment has been minimized.

Collaborator

koskimas commented Jun 5, 2018

Thanks @elhigu. Any plans for the timeline of the next release?

@elhigu

This comment has been minimized.

Collaborator

elhigu commented Jun 5, 2018

This month. I'm currently fixing mssql + adding it to CI. There were some breaking changes made so I want to get that to 0.15. too. Few tests are still failing so it shouldn't take too long to finish.

@elhigu

This comment has been minimized.

Collaborator

elhigu commented Jun 5, 2018

@koskimas btw. there are npm scripts nowadays in package.json to be able to run oracle tests locally in docker.

veikovx added a commit to veikovx/knex that referenced this pull request Sep 17, 2018

elhigu added a commit that referenced this pull request Sep 26, 2018

Kill queries after timeout for PostgreSQL (#2636)
* Kill queries after timeout for PostgreSQL

* Fix cancellation connection acquiring and test.

* Fix releasing connection in case query cancellation fails

* Add support for native enums on Postgres (#2632)

Reference https://www.postgresql.org/docs/current/static/sql-createtype.html

Closes #394

Signed-off-by: Will Soto <will.soto9@gmail.com>

* Removal of 'skim' (#2520)

* Allow overwriting log functions (#2625)

* Example build of custom log functions
* Handle logger object better for transactions
* Adjust test to ignore sqlite warning message

* Fixed onIn with empty values array (#2513)

* Drop support for strong-oracle (#2487)

* Remove babel-plugin-lodash (#2634)

While in theory, this may reduce the bundle size,
in practice it adds a ton of overhead during startup
due to the number of additional requires. Bundle
size also shouldn't matter for server side modules.

* Add json support to the query builder for mysql (#2635)

* Add json support to the query builder for mysql

refs #1036

Based on #1902

* Clarify supported version

* fix wrapIdentifier not being called in postgres alter column (#2612)

* fix wrapIdentifier not being called in postgres alter column

* add test for wrapIdentifier call in postgres alter column

* add comment regarding issue

* add issue & PR #'s in comment

* Remove readable-stream and safe-buffer (#2640)

* Add json support to the query builder for mysql

refs #1036

Based on #1902

* Clarify supported version

* Use native Buffer and Stream implementations

* fixes 2630 (#2642)

* Timeout errors shouldn't silently ignore the passed errors, but rather reject with original error. Fixes #2582 (#2626)

* chore: add Node.js 10 (#2594)

* chore: add Node.js 10

* chore: trigger new build

* chore: update lockfile

* chore: trigger new build

* fix: use npm i instead of npm ci

* Fix mssql driver crashing (#2637)

* Run SQL Server tests locally running SQL server in docker

* WIP mssql test stuff

* Patched MSSQL driver to not crash knex anymore

* Removed semicolon from rollback stmt for oracle (#2564)

* Remove WebSQL dialect (#2647)

* Add json support to the query builder for mysql

refs #1036

Based on #1902

* Clarify supported version

* Use native Buffer and Stream implementations

* Remove WebSQL dialect

* add homepage field to package.json (#2650)

* Make the stream catch errors in the query (#2638)

* Make the stream catch errors in the query

* Fix another case in which stream doesnt emits error

* Linter stuff

* Remove setTimeout in tests

* Make a test not to check the MySQL error code

* Fix stream error catching for MariaDB and PostgreSQL

* Fix stream error catching in Oracle

* Throw the error after emitting it to the stream

* Throw the error without instantiating a new Error

* Various fixes to mssql dialect (#2653)

* Fixed float type of mssql to be float

* Many tests where postgres test was not actually ran at all

* Migrations to be mssql compatible

Mssql driver doesn't handle if multiple queries are sent to same transaction concurrently.

* Prevented mssql failing when invalid schema builder was executed by accident

Instead of trying to generate sql from broken schema calls, just make exception to leak before query compiling is started

* Fixed mssql trx rollback to always throw an error

Also modified some connection test query to be mssql compatible

* Fixed various bugs from MSSQL driver to make tests run

* Fixed mssql unique index to be compatible with other dialect implementations

* Enable running mssql tests on CI

* Test for #2588

* Updated tests to not be dependend on tables left from previous test rans

* Trying to make mssql server work on travis

* Updated changelog and version

* Drop mariadb support  (#2681)

* Dropped support for mariasql

* ESLint

* Fixed docs to build again

* Fix knex.initialize() and adds test (#2477)

* Fix knex.initialize() and adds test

* Fix knex.initialize() and adds test

* Added test for reinitializing pool after destroy

* Fixed destroy / reinitialization test

* Fixed the fix

* Implement missing schema support for mssql dialect

* chore: Update dependencies. Remove estraverse (#2691)

* Update dependencies. Remove estraverse

* Fix compatibility with new Sinon

* Increase mssql timeout

* Normalized and validated driverNames of test db clients and fixed oracle test setup (#2692)

* Normalized and validated driverNames of test db clients and fixed oracle test setup

* Fixed failed queries from old query building tests which hadn't been ran in ages

* Allow selecting node version which is used to run oracledb docker tests

* Improved sql tester error messages

* Fixed rest of the oracledb tests

* Removed invalid flag from docker-compose

* Print mssql logs if initialization fails

* Fixed syntax error + final tests

* Added restart of failure for mssql DB initialization to try again if server was not ready

* Printout always mssql logs after container is started

* Fixed wait time printing after trying to connect

* Use npm run oracledb:test for testing oracle in travis

* Add Prettier (#2697)

* Add prettier
* Run files through prettier

* Istanbul -> NYC (#2700)

* istanbul -> nyc

* Update mocha

* Enforce code coverage (#2702)

* Enforce code coverage
* Update coverage numbers with current values

* version assignment on base class, copy on tx client, fix #2705

* Update changelog

* v0.15.1

* Added build step to test script. Fixes #2541 (#2712)

* Revert "Added build step to test script. Fixes #2541 (#2712)" (#2714)

This reverts commit 90ed8db.

* Allow oracle failures for now

* Fix issue with select(0) (#2711)

* Fix issue with select(0). Fixes #2658

* Refactor migrator (#2695)

* Refactor migrator

* Fix exports

* Fix ESLint

* Fix migrator

* Fix reference to config

* Split some more

* Fix table builder

* Fix argument order

* Merge branch 'master' of https://github.com/tgriesser/knex into feature/2690-support-multiple-migration-dirs

# Conflicts:
#	src/migrate/index.js
#	test/index.js
#	test/unit/migrate/migrator.js

* Fix #2715 (#2721)

* Fix #2715, explicitly set precision in datetime & timestamp
* Allow for precision in knex.fn.now, mysql time
* Add test for datetime with precision

* Bump changelog

* 0.15.2

* Fix issues with warnPromise when migration does not return a promise. Fixes #2725 (#2730)

* Add tests for multiple union arguments with callbacks and builders (#2749)

* Add tests for multiple union arguments

* Add some callback and raw tests to union unit tests

* Compile with before update so that bindings are put in correct order (#2733)

* Fix join using builder withSchema. (#2744)

* Use Datetime2 for MSSQL datetime + timestamp types (#2757)

* Use Datetime2 for MSSQL datetime + timestamp types

Datetime2 is now the recommended column type for new date work: https://docs.microsoft.com/en-us/sql/t-sql/data-types/datetime-transact-sql?view=sql-server-2017

* Add tests for MSSQL datetime2 changes

* General/document breaking change (#2774)

* Add changelog entry for a breaking change

* Improve entry

* Allow timestamp with timezone on mssql databases (#2724)

* Allow timestamp with timezone on mssql databases

* Change timestamp parameter to use object instead of boolean

* Update dependencies (#2772)

* Feature/2690: Multiple migration directories (#2735)

* Implement support for multiple migration directories

* Add tests for new functionality

* Fix tape tests

* Pass migration directory upwards

* Fix multiple directory support

* Fix bugs

* Rollback correctly

* Fix remaining tests

* Address comments

* #2758: Implement fail-fast logic for dialect resolution (#2776)

* Implement fail-fast logic for dialect resolution, clean-up code around.

* Remove method that was deprecated long time ago

* Address additional comments

* Try addressing comments

* Set client explicitly

* Fix compatibility with older Node versions

* Use columnize instead of wrap in using(). (#2713)

* Use columnize instead of wrap in using().

This is an attempt to fix #2136. Also added an integration test, couldn't find any existing.

* Exclude MSSQL from test as it does not support .using

* Change test to not use subquery

* Change test

* Introduced abstraction for getting migrations (#2775)

* Introduced abstraction for getting migrations

This would allow a webpack migration source which is compatible with bundling.

* Fixed migration validation with custom migration source

* Fixed issues after rebasing on muti directory PR

* Renamed parameter and fixed error message

* Addressed some PR comments

* Finished comment

* Moved filename extension filtering into fs-migrator

* Added test showing in memory custom migration source

* Cleaned up how to get config

* Fixed failing test

* Hopefully fix tests

* Fix Node.js 10 support in tests

* Test for correctly releasing cancel query connection
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment