2646 Commits

Author SHA1 Message Date
Mikael Lepistö
69e33c7f64 Pass valueForUndefined also to transacting client. Fixes #1423 2016-05-19 18:53:29 +03:00
wubzz
3a671c5861 Merge pull request #1418 from alexwhitman/batch-insert-on-transaction
Use calling transaction with batchInsert
2016-05-19 13:34:46 +02:00
Kaarel Raspel
41344a9399 Fix configs in tests 2016-05-19 13:33:13 +03:00
Kaarel Raspel
0ebd56d0bb Fix typeof result to 'function' 2016-05-19 13:25:39 +03:00
Alex Whitman
202ddddddb Use calling transaction with batchInsert 2016-05-19 11:07:29 +01:00
Kaarel Raspel
eed3d91c7f Refactor and tests
- Test for implemented case
- Test for currently untested case
2016-05-19 12:48:59 +03:00
Kaarel Raspel
46b686b4f0 Expose Knex version also on the constructor. Previously only exposed on knex instance or read straight from package.json. 2016-05-19 11:46:35 +03:00
Kaarel Raspel
2b759d1c13 Travis CI 2016-05-19 10:00:32 +03:00
Rhys van der Waerden
d40e578cad Merge pull request #1416 from tgriesser/feature/eslint
Feature/eslint
2016-05-18 21:39:53 +10:00
Rhys van der Waerden
e7a42abbb2 Merge branch 'master' into feature/eslint
# Conflicts:
#	src/client.js
#	src/dialects/mssql/transaction.js
#	src/dialects/oracle/transaction.js
#	src/runner.js
#	src/transaction.js
2016-05-18 21:30:59 +10:00
Rhys van der Waerden
2acd6e5daa Make spaces in import braces consistent
`import {module}` -> `import { module }`
2016-05-18 20:22:50 +10:00
Rhys van der Waerden
ba3ba382e7 Remove unnecessary function wrapper 2016-05-18 20:09:51 +10:00
Rhys van der Waerden
2e7650a8e4 Remove JSHint comments 2016-05-18 20:07:33 +10:00
Rhys van der Waerden
06e3447440 Remove duplicate spaces in assignments.
These were previously horizontally aligned. The esnext conversion disrupted them all.
2016-05-18 19:59:24 +10:00
Rhys van der Waerden
c292fd5917 Linter warnings are errors in CI 2016-05-18 19:34:35 +10:00
Mikael Lepistö
c39f6298d2 Merge pull request #1417 from mdrmuhaimin/patch-2
Proper error message for undefined where options
2016-05-18 08:45:54 +03:00
Jurko Gospodnetić
ffc7bd4ae8 removed corpse Transaction._skipping() function 2016-05-17 05:20:27 +02:00
Rhys van der Waerden
eedd263c8a Merge pull request #1394 from devinivy/acquire-timeout
Abort request for connection from pool upon knex timeout
2016-05-17 10:50:13 +10:00
Muhammad Raihan Muhaimin
aa7ba2d5dd Proper error message for undefined where options
When user provides a knex select statement with an undefined options in where clause it is not properly handled an give an ambiguous error message telling `Unhandled rejection TypeError: Cannot read property 'toString' of undefined.` This PR will helpful to users at it will tell them the exact problem.
2016-05-16 13:13:53 -04:00
Rhys van der Waerden
3846b7182c Make codebase conform to ESLint rules
Just a couple of changes.
2016-05-17 01:01:34 +10:00
Rhys van der Waerden
cfe80e34ce Replace jshint with eslint 2016-05-17 00:58:28 +10:00
Rhys van der Waerden
1649b2f603 Merge pull request #1410 from wubzz/bugfix/querybuilder_raw_ignores_not_flag
Make sure 'raw' respects the "not" flag in the query builder. Fixes #…
2016-05-16 09:22:39 +10:00
Rhys van der Waerden
280148bc33 Merge pull request #1412 from tgriesser/feature/read-version-from-package-json
Read `version` from `package.json`
2016-05-15 23:59:00 +10:00
Rhys van der Waerden
f320906577 Read version from package.json
Means that it's impossible to have `Knex#VERSION` and the version in `package.json` out of sync. This is one less thing to do for release.

This required the addition of `json-loader` for webpack. I've also added webpack to `devDependencies` rather than installing it manually during the `build` script.
2016-05-15 21:38:34 +10:00
wubzz
c3aba51888 Merge pull request #1409 from wubzz/bugfix/faulty_returning_documentation
Fix faulty documentation of MySQL support of .returning. Fixes #1398
2016-05-14 22:57:51 +02:00
wubzz
c511b8c582 Merge pull request #1408 from wubzz/bugfix/postgres_renametable_withSchema
Don't include schemaName in the new tablename, only on the old tablen…
2016-05-14 22:57:48 +02:00
wubzz
f097e9147b Make sure 'raw' respects the "not" flag in the query builder. Fixes #1402 2016-05-14 22:36:13 +02:00
wubzz
5c77ee2acd Fix faulty documentation of MySQL support of .returning. Fixes #1398 2016-05-14 22:10:28 +02:00
wubzz
655d4b56f9 Don't include schemaName in the new tablename, only on the old tablename. Fixes #1403 2016-05-14 22:09:20 +02:00
Rhys van der Waerden
72af0869cb release 0.11.3 0.11.3 2016-05-14 11:24:46 +10:00
Rhys van der Waerden
05969f07aa Prepare for 0.11.3 release 2016-05-14 11:23:30 +10:00
Rhys van der Waerden
a06b44a29c Merge pull request #1397 from atiertant/join-nest-statements
Allow joins to nest conditional statements
2016-05-14 11:19:51 +10:00
Rhys van der Waerden
496f8de638 release 0.11.2 0.11.2 2016-05-14 10:32:37 +10:00
Rhys van der Waerden
e491212c6b Prepare for 0.11.2 release 2016-05-14 10:30:05 +10:00
Rhys van der Waerden
815c6ce8f0 Merge pull request #1401 from nickwhiteley/master
#1348 MSSQL adding and dropping multiple columns fix
2016-05-14 10:06:08 +10:00
Mikael Lepistö
9bded9363b Merge pull request #1396 from elhigu/evaluate-multi-insert-undefined-key-replace-already-in-query-compiler
Evaluated multi insert default for undefined already in query compiler
2016-05-13 18:55:17 +03:00
Nick Whiteley
4161dab19e #1348 MSSQL adding and dropping multiple columns fix 2016-05-12 10:24:29 +01:00
Alexandre Tiertant
064f31f6f2 update documentation 2016-05-12 11:21:00 +02:00
Mikael Lepistö
c935b583cb Insert tests were ran before DB was initialized (schema / migrate / seed). 2016-05-12 10:43:33 +03:00
Mikael Lepistö
9114bdd8b3 Changed implementation of replacing undefined with DEFAULT already in query compiler for every dialect. 2016-05-12 10:24:42 +03:00
Mikael Lepistö
9fab58c2b2 Evaluated multi insert default for undefined already in query compiler 2016-05-12 10:24:42 +03:00
Alexandre Tiertant
f3c78f6c85 add test 2016-05-12 09:09:42 +02:00
Rhys van der Waerden
ea022fe297 Merge pull request #1400 from mgmcdermott/patch-1
Fix broken "browser builds" link
2016-05-12 09:58:09 +10:00
Michael McDermott
66defcc11e Fix broken "browser builds" link 2016-05-11 19:13:19 -04:00
wubzz
c2a6cfbc52 Merge pull request #1392 from wubzz/feature/improvements_to_batchInsert
BatchInsert remake proposal. Fixes #1391
2016-05-11 17:58:10 +02:00
wubzz
59d9ff89cd Remove mysql from assertions 2016-05-11 17:49:18 +02:00
wubzz
6bd4b8ac32 Only assert returning values on supported dialects. 2016-05-11 17:31:33 +02:00
Alexandre Tiertant
840a585665 fix using 2016-05-11 16:22:15 +02:00
Alexandre Tiertant
eeace3d557 fix param 2016-05-11 15:51:48 +02:00
Alexandre Tiertant
89d85d28a3 fix #690 2016-05-11 15:26:53 +02:00