diff options
| author | drh <drh@noemail.net> | 2013-09-11 11:38:58 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-09-11 11:38:58 +0000 |
| commit | aae0f9e462a4b49fbd641e4ecb90a992fca91f45 (patch) | |
| tree | 58ed06b23f869e02cdbbe1f5090ed3d547ea820c /src | |
| parent | abfa6d52edd9e6d37fed8c231cfb4f4e966320e5 (diff) | |
| download | sqlite-aae0f9e462a4b49fbd641e4ecb90a992fca91f45.tar.gz sqlite-aae0f9e462a4b49fbd641e4ecb90a992fca91f45.zip | |
Change the name of the two-argument unlikely() function to likelihood().
Add test cases.
FossilOrigin-Name: 29a359b8d7f90e6fa2b28ce2a112284fd3870494
Diffstat (limited to 'src')
| -rw-r--r-- | src/func.c | 2 | ||||
| -rw-r--r-- | src/resolve.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/func.c b/src/func.c index 26cbfbfb0..ae7945111 100644 --- a/src/func.c +++ b/src/func.c @@ -1663,7 +1663,7 @@ void sqlite3RegisterGlobalFunctions(void){ FUNCTION(hex, 1, 0, 0, hexFunc ), FUNCTION2(ifnull, 2, 0, 0, noopFunc, SQLITE_FUNC_COALESCE), FUNCTION2(unlikely, 1, 0, 0, noopFunc, SQLITE_FUNC_UNLIKELY), - FUNCTION2(unlikely, 2, 0, 0, noopFunc, SQLITE_FUNC_UNLIKELY), + FUNCTION2(likelihood, 2, 0, 0, noopFunc, SQLITE_FUNC_UNLIKELY), FUNCTION(random, 0, 0, 0, randomFunc ), FUNCTION(randomblob, 1, 0, 0, randomBlob ), FUNCTION(nullif, 2, 0, 1, nullifFunc ), diff --git a/src/resolve.c b/src/resolve.c index 40acc91bc..5f238e102 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -700,8 +700,8 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ if( n==2 ){ pExpr->iTable = exprProbability(pList->a[1].pExpr); if( pExpr->iTable<0 ){ - sqlite3ErrorMsg(pParse, "second parameter to unlikely() must be " - "between 0.0 and 1.0"); + sqlite3ErrorMsg(pParse, "second argument to likelihood() must be a " + "constant between 0.0 and 1.0"); pNC->nErr++; } }else{ |