Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
public
/
sequelize
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
不要怂,就是干,撸起袖子干!
Commit 695676f0
authored
Mar 06, 2015
by
Mick Hansen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(sql/where): add $all support
1 parent
cfa51164
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
72 additions
and
22 deletions
lib/dialects/abstract/query-generator.js
test/unit/sql/where.test.js
lib/dialects/abstract/query-generator.js
View file @
695676f
...
@@ -1736,14 +1736,14 @@ module.exports = (function() {
...
@@ -1736,14 +1736,14 @@ module.exports = (function() {
}
else
{
}
else
{
value
=
'(NULL)'
;
value
=
'(NULL)'
;
}
}
}
else
if
(
value
&&
value
.
$any
)
{
}
else
if
(
value
&&
(
value
.
$any
||
value
.
$all
)
)
{
comparator
=
'= ANY
'
;
comparator
=
value
.
$any
?
'= ANY'
:
'= ALL
'
;
if
(
value
.
$any
.
$values
)
{
if
(
value
.
$any
&&
value
.
$any
.
$values
||
value
.
$all
&&
value
.
$all
.
$values
)
{
value
=
'(VALUES '
+
value
.
$any
.
$values
.
map
(
function
(
value
)
{
value
=
'(VALUES '
+
(
value
.
$any
&&
value
.
$any
.
$values
||
value
.
$all
&&
value
.
$all
.
$values
)
.
map
(
function
(
value
)
{
return
'('
+
this
.
escape
(
value
)
+
')'
;
return
'('
+
this
.
escape
(
value
)
+
')'
;
}.
bind
(
this
)).
join
(
', '
)
+
')'
;
}.
bind
(
this
)).
join
(
', '
)
+
')'
;
}
else
{
}
else
{
value
=
'('
+
this
.
escape
(
value
.
$any
,
field
)
+
')'
;
value
=
'('
+
this
.
escape
(
value
.
$any
||
value
.
$all
,
field
)
+
')'
;
}
}
}
else
if
(
value
&&
(
value
.
$between
||
value
.
$notBetween
))
{
}
else
if
(
value
&&
(
value
.
$between
||
value
.
$notBetween
))
{
comparator
=
'BETWEEN'
;
comparator
=
'BETWEEN'
;
...
...
test/unit/sql/where.test.js
View file @
695676f
...
@@ -137,26 +137,28 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
...
@@ -137,26 +137,28 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
},
{
},
{
default
:
'[muscles] != 3'
default
:
'[muscles] != 3'
});
});
});
testsql
(
'muscles'
,
{
suite
(
'$notIn'
,
function
()
{
$not
:
[
2
,
4
]
testsql
(
'equipment'
,
{
$notIn
:
[]
},
{
},
{
default
:
'[
muscles] NOT IN (2, 4
)'
default
:
'[
equipment] NOT IN (NULL
)'
});
});
testsql
(
'
muscles
'
,
{
testsql
(
'
equipment
'
,
{
$notIn
:
[
2
,
4
]
$notIn
:
[
4
,
19
]
},
{
},
{
default
:
'[
muscles] NOT IN (2, 4
)'
default
:
'[
equipment] NOT IN (4, 19
)'
});
});
});
});
suite
(
'$n
otIn
'
,
function
()
{
suite
(
'$n
e
'
,
function
()
{
testsql
(
'e
quipment
'
,
{
testsql
(
'e
mail
'
,
{
$n
otIn
:
[]
$n
e
:
'jack.bauer@gmail.com'
},
{
},
{
default
:
'[equipment] NOT IN (NULL)'
default
:
"[email] != 'jack.bauer@gmail.com'"
})
;
})
});
});
suite
(
'$and/$or'
,
function
()
{
suite
(
'$and/$or'
,
function
()
{
...
@@ -312,6 +314,18 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
...
@@ -312,6 +314,18 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
});
});
testsql
(
'muscles'
,
{
testsql
(
'muscles'
,
{
$contains
:
[
2
,
5
]
},
{
field
:
{
type
:
DataTypes
.
ARRAY
(
DataTypes
.
INTEGER
)
}
},
{
postgres
:
'"muscles" @> ARRAY[2,5]::INTEGER[]'
});
});
suite
(
'$overlap'
,
function
()
{
testsql
(
'muscles'
,
{
$overlap
:
[
3
,
11
]
$overlap
:
[
3
,
11
]
},
{
},
{
postgres
:
'"muscles" && ARRAY[3,11]'
postgres
:
'"muscles" && ARRAY[3,11]'
...
@@ -324,13 +338,9 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
...
@@ -324,13 +338,9 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
});
});
testsql
(
'muscles'
,
{
testsql
(
'muscles'
,
{
$contains
:
[
2
,
5
]
"&&"
:
[
9
,
182
]
},
{
},
{
field
:
{
postgres
:
'"muscles" && ARRAY[9,182]'
type
:
DataTypes
.
ARRAY
(
DataTypes
.
INTEGER
)
}
},
{
postgres
:
'"muscles" @> ARRAY[2,5]::INTEGER[]'
});
});
});
});
...
@@ -373,6 +383,46 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
...
@@ -373,6 +383,46 @@ suite(Support.getTestDialectTeaser('SQL'), function() {
});
});
});
});
});
});
suite
(
'$all'
,
function
()
{
testsql
(
'userId'
,
{
$all
:
[
4
,
5
,
6
]
},
{
postgres
:
'"userId" = ALL (ARRAY[4,5,6])'
});
testsql
(
'userId'
,
{
$all
:
[
2
,
5
]
},
{
field
:
{
type
:
DataTypes
.
ARRAY
(
DataTypes
.
INTEGER
)
}
},
{
postgres
:
'"userId" = ALL (ARRAY[2,5]::INTEGER[])'
});
suite
(
'$values'
,
function
()
{
testsql
(
'userId'
,
{
$all
:
{
$values
:
[
4
,
5
,
6
]
}
},
{
postgres
:
'"userId" = ALL (VALUES (4), (5), (6))'
});
testsql
(
'userId'
,
{
$all
:
{
$values
:
[
2
,
5
]
}
},
{
field
:
{
type
:
DataTypes
.
ARRAY
(
DataTypes
.
INTEGER
)
}
},
{
postgres
:
'"userId" = ALL (VALUES (2), (5))'
});
});
});
});
});
}
}
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment