Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AFD551069A for ; Thu, 3 Oct 2013 17:20:38 +0000 (UTC) Received: (qmail 44493 invoked by uid 500); 3 Oct 2013 17:20:38 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 44430 invoked by uid 500); 3 Oct 2013 17:20:37 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 44423 invoked by uid 99); 3 Oct 2013 17:20:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 17:20:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2013 17:20:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A0118238899C; Thu, 3 Oct 2013 17:20:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1528947 [2/2] - /db/derby/docs/branches/10.10/src/ref/ Date: Thu, 03 Oct 2013 17:20:11 -0000 To: derby-commits@db.apache.org From: chaase3@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131003172013.A0118238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: db/derby/docs/branches/10.10/src/ref/rrefjdbc88908.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefjdbc88908.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefjdbc88908.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefjdbc88908.dita Thu Oct 3 17:20:10 2013 @@ -69,7 +69,7 @@ limitations under the License.

You can specify functions in JDBC escape syntax by using the fn keyword.

Syntax -{fn functionCall} +{ fn functionCall }

where functionCall is the name of one of the scalar functions listed below. The functions are of the following types:

    @@ -83,35 +83,35 @@ below. The functions are of the followin
    abs
    Returns the absolute value of a number. -abs(NumericExpression) -

    The JDBC escape syntax {fn abs(NumericExpression)} is -equivalent to the built-in syntax ABS(NumericExpression). +abs ( numericExpression ) +

    The JDBC escape syntax {fn abs(numericExpression)} is +equivalent to the built-in syntax ABS(numericExpression). For more information, see .

    acos
    Returns the arc cosine of a specified number. -acos(number) +acos ( number )

    The JDBC escape syntax {fn acos(number)} is equivalent to the built-in syntax ACOS(number). For more information, see .

    asin
    Returns the arc sine of a specified number. -asin(number) +asin ( number )

    The JDBC escape syntax {fn asin(number)} is equivalent to the built-in syntax ASIN(number). For more information, see .

    atan
    Returns the arc tangent of a specified number. -atan(number) +atan ( number )

    The JDBC escape syntax {fn atan(number)} is equivalent to the built-in syntax ATAN(number). For more information, see .

    atan2
    Returns the arc tangent in radians of y/x. -atan2(y, x) +atan2 ( y, x )

    The JDBC escape syntax {fn atan2(y, x)} is equivalent to the built-in syntax ATAN2(y, x). For more information, see .

    @@ -119,35 +119,35 @@ For more information, see .

    cos
    Returns the cosine of a specified number. -cos(number) +cos ( number )

    The JDBC escape syntax {fn cos(number)} is equivalent to the built-in syntax COS(number). For more information, see .

    cot
    Returns the cotangent of a specified number. -cot(number) +cot ( number )

    The JDBC escape syntax {fn cot(number)} is equivalent to the built-in syntax COT(number). For more information, see .

    degrees
    Converts a specified number from radians to degrees. -degrees(number) +degrees ( number )

    The JDBC escape syntax {fn degrees(number)} is equivalent to the built-in syntax DEGREES(number). For more information, see .

    exp
    Returns e raised to the power of the specified number. -exp(number) +exp ( number )

    The JDBC escape syntax {fn exp(number)} is equivalent to the built-in syntax EXP(number). For more information, see .

    @@ -155,21 +155,21 @@ information, see .

    log
    Returns the natural logarithm (base e) of the specified number. -log(number) +log ( number )

    The JDBC escape syntax {fn log(number)} is equivalent to the built-in syntax LOG(number). For more information, see .

    log10
    Returns the base-10 logarithm of the specified number. -log10(number) +log10 ( number )

    The JDBC escape syntax {fn log10(number)} is equivalent to the built-in syntax LOG10(number). For more information, see .

    @@ -177,30 +177,30 @@ more information, see .

    pi
    Returns a value that is closer than any other value to pi. -pi() +pi ( )

    The JDBC escape syntax {fn pi()} is equivalent to the built-in syntax PI(). For more information, see .

    radians
    Converts a specified number from degrees to radians. -radians(number) +radians ( number )

    The JDBC escape syntax {fn radians(number)} is equivalent to the built-in syntax RADIANS(number). For more information, see .

    rand
    Returns a random number given a seed number. -rand(seed) +rand ( seed )

    The JDBC escape syntax {fn rand(seed)} is equivalent to the built-in syntax RAND(seed). For more information, see .

    @@ -208,29 +208,29 @@ information, see .

    sin
    Returns the sine of a specified number. -sin(number) +sin ( number )

    The JDBC escape syntax {fn sin(number)} is equivalent to the built-in syntax SIN(number). For more information, see .

    sqrt
    Returns the square root of a floating-point number. -sqrt(FloatingPointExpression) +sqrt ( number )

    The JDBC escape syntax -{fn sqrt(FloatingPointExpression)} is equivalent to the -built-in syntax SQRT(FloatingPointExpression). For more +{fn sqrt(number)} is equivalent to the +built-in syntax SQRT(number). For more information, see .

    tan
    Returns the tangent of a specified number. -tan(number) +tan ( number )

    The JDBC escape syntax {fn tan(number)} is equivalent to the built-in syntax TAN(number). For more information, see .

    @@ -241,78 +241,78 @@ information, see .

    lcase
    Returns a string in which all alphabetic characters in the argument have been converted to lowercase. -lcase(CharacterExpression) +lcase ( characterExpression )

    The JDBC escape syntax -{fn lcase(CharacterExpression)} is equivalent to the -built-in syntax LCASE(CharacterExpression). For more +{fn lcase(characterExpression)} is equivalent to the +built-in syntax LCASE(characterExpression). For more information, see .

    length
    Returns the number of characters in a character string expression. -length(CharacterExpression) +length ( characterExpression )

    The JDBC escape syntax -{fn length(CharacterExpression)} is equivalent to the -built-in syntax LENGTH(CharacterExpression). For more +{fn length(characterExpression)} is equivalent to the +built-in syntax LENGTH(characterExpression). For more information, see .

    locate
    -
    Returns the position in the second CharacterExpression of the first -occurrence of the first CharacterExpression. Searches from the beginning -of the second CharacterExpression, unless the startIndex parameter +
    Returns the position in the second characterExpression of the first +occurrence of the first characterExpression. Searches from the beginning +of the second characterExpression, unless the startIndex parameter is specified. -locate(CharacterExpression,CharacterExpression [, startIndex] ) +locate ( characterExpression, characterExpression [ , startIndex ] )

    The JDBC escape syntax -{fn locate(CharacterExpression, CharacterExpression +{fn locate(characterExpression, characterExpression [, startIndex] )} is equivalent to the built-in syntax -LOCATE(CharacterExpression, CharacterExpression -[, StartPosition] ). For more information, see +LOCATE(characterExpression, characterExpression +[, startPosition] ). For more information, see .

    ltrim
    Removes blanks from the beginning of a character string expression. -ltrim(CharacterExpression) +ltrim ( characterExpression )

    The JDBC escape syntax -{fn ltrim(CharacterExpression)} is equivalent to the -built-in syntax LTRIM(CharacterExpression). For more +{fn ltrim(characterExpression)} is equivalent to the +built-in syntax LTRIM(characterExpression). For more information, see .

    rtrim
    Removes blanks from the end of a character string expression. -rtrim(CharacterExpression) +rtrim ( characterExpression )

    The JDBC escape syntax -{fn rtrim(CharacterExpression)} is equivalent to the -built-in syntax RTRIM(CharacterExpression). For more +{fn rtrim(characterExpression)} is equivalent to the +built-in syntax RTRIM(characterExpression). For more information, see .

    substring
    Forms a character string by extracting length characters from the -CharacterExpression beginning at startIndex. The index of the -first character in the CharacterExpression is 1. -substring(CharacterExpression, startIndex, length) +characterExpression beginning at startIndex. The index of the +first character in the characterExpression is 1. +substring ( characterExpression, startIndex, length )

    The JDBC escape syntax -{fn substring(CharacterExpression, startIndex, +{fn substring(characterExpression, startIndex, length)} is equivalent to the built-in syntax -SUBSTR(CharacterExpression, startIndex, +SUBSTR(characterExpression, startIndex, length). For more information, see .

    ucase
    Returns a string in which all alphabetic characters in the argument have been converted to uppercase. -ucase(CharacterExpression) +ucase ( characterExpression )

    The JDBC escape syntax -{fn ucase(CharacterExpression)} is equivalent to the -built-in syntax UCASE(CharacterExpression). For more +{fn ucase(characterExpression)} is equivalent to the +built-in syntax UCASE(characterExpression). For more information, see .

    @@ -321,28 +321,28 @@ information, see .

    curtime
    Returns the current time. -curtime() +curtime ( )

    The JDBC escape syntax {fn curtime()} is equivalent to the built-in syntax CURRENT_TIME. For more information, see .

    hour
    Returns the hour part of a time value. -hour(expression) +hour ( expression )

    The JDBC escape syntax {fn hour(expression)} is equivalent to the built-in syntax HOUR(expression). For more information, see .

    minute
    Returns the minute part of a time value. -minute(expression) +minute ( expression )

    The JDBC escape syntax {fn minute(expression)} is equivalent to the built-in syntax MINUTE(expression). For more information, see @@ -350,7 +350,7 @@ For more information, see

    month
    Returns the month part of a date value. -month(expression) +month ( expression )

    The JDBC escape syntax {fn month(expression)} is equivalent to the built-in syntax MONTH(expression). For more information, see @@ -358,7 +358,7 @@ For more information, see

    second
    Returns the seconds part of a time value. -second(expression) +second ( expression )

    The JDBC escape syntax {fn second(expression)} is equivalent to the built-in syntax SECOND(expression). For more information, see @@ -371,7 +371,7 @@ timestamp based on the interval type and You can subtract from the timestamp by using negative integers.

    TIMESTAMPADD is a JDBC escaped function and is accessible only by using the JDBC escape function syntax.

    -TIMESTAMPADD( interval, integerExpression, timestampExpression ) +TIMESTAMPADD ( interval, integerExpression, timestampExpression )

    To perform TIMESTAMPADD on dates and times, it is necessary to convert the dates and times to timestamps. Dates are converted to timestamps by putting 00:00:00.0 in the time-of-day fields. Times are converted to @@ -385,7 +385,7 @@ between two timestamp values at a specif can return the number of minutes between two specified timestamps.

    The TIMESTAMPDIFF is a JDBC escaped function and is accessible only by using the JDBC escape function syntax.

    -TIMESTAMPDIFF( interval, timestampExpression1, timestampExpression2 ) +TIMESTAMPDIFF ( interval, timestampExpression1, timestampExpression2 )

    To perform TIMESTAMPDIFF on dates and times, it is necessary to convert the dates and times to timestamps. Dates are converted to timestamps by putting 00:00:00.0 in the time-of-day fields. Times are converted to @@ -395,7 +395,7 @@ clauses, because the optimizer will not

    year
    Returns the year part of a date value. -year(expression) +year ( expression )

    The JDBC escape syntax {fn year(expression)} is equivalent to the built-in syntax YEAR(expression). For more information, see @@ -430,7 +430,7 @@ the following syntax:

    user
    Returns the authorization identifier or name of the current user. If there is no current user, it returns APP. -user() +user ( )

    The JDBC escape syntax {fn user()} is equivalent to the built-in syntax USER. For more information, see .

    Modified: db/derby/docs/branches/10.10/src/ref/rrefjdbcescapedate.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefjdbcescapedate.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefjdbcescapedate.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefjdbcescapedate.dita Thu Oct 3 17:20:10 2013 @@ -28,9 +28,10 @@ limitations under the License.

    interprets the JDBC escape syntax for dates as equivalent to the correct SQL syntax for dates.

    -Syntax{d 'yyyy-mm-dd'} +Syntax +{ d 'yyyy-mm-dd' }
    Equivalent to -DATE('yyyy-mm-dd')
    +DATE('yyyy-mm-dd') Example VALUES {d '2010-10-19'} Modified: db/derby/docs/branches/10.10/src/ref/rrefpgc1.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefpgc1.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefpgc1.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefpgc1.dita Thu Oct 3 17:20:10 2013 @@ -24,11 +24,11 @@ limitations under the License.

    The JDBC API defines the following parameters for this method call:

      -
    • catalog

      always use null for this parameter in .

    • +
    • catalog

      Always use null for this parameter in .

    • schemaPattern

      Java procedures have a schema.

    • -
    • procedureNamePattern

      a String object representing a procedure +

    • procedureNamePattern

      A String object representing a procedure name pattern.

    • -
    • column-Name-Pattern

      a String +

    • columnNamePattern

      A String object representing the name pattern of the parameter names or return value names. Java procedures have parameter names matching those defined in the CREATE PROCEDURE statement. Use "%" to find all parameter names.

    • Modified: db/derby/docs/branches/10.10/src/ref/rrefsecondfunc.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsecondfunc.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsecondfunc.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsecondfunc.dita Thu Oct 3 17:20:10 2013 @@ -33,7 +33,7 @@ If the argument can be null, the result can be null. If the argument is null, the result is 0.

    -SyntaxSECOND ( expression ) +SyntaxSECOND ( expression ) Example

    The RECEIVED column contains a timestamp that has an internal value equivalent to 2005-12-25-17.12.30.000000. Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj16762.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj16762.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj16762.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj16762.dita Thu Oct 3 17:20:10 2013 @@ -28,7 +28,8 @@ limitations under the License. a bit string expression and returns the number of characters in the result.

    Because all built-in data types are implicitly converted to strings, this function can act on all built-in data types.

    -Syntax LENGTH ( { CharacterExpression | BitExpression } ) +Syntax +LENGTH ( characterExpression | bitExpression ) Examples -- returns 20 VALUES LENGTH('supercalifragilistic') Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj29930.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj29930.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj29930.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj29930.dita Thu Oct 3 17:20:10 2013 @@ -28,14 +28,18 @@ limitations under the License.

    UCASE or UPPER takes a character expression as a parameter and returns a string in which all alpha characters have been converted to uppercase.

    -SyntaxUCASE or UPPER ( CharacterExpression )

    If +Syntax +UCASE ( characterExpression ) +UPPER ( characterExpression ) +

    If the parameter type is CHAR , the return type is CHAR. Otherwise, the return type is VARCHAR. UPPER and LOWER follow the database locale. See for more information about specifying locale.

    The length and maximum length of the returned value are the same as the length and maximum length of the parameter.

    Example

    To return the string aSD1#w in -uppercase, use the following clause:VALUES UPPER('aSD1#w')The +uppercase, use the following clause: +VALUES UPPER('aSD1#w')The value returned is ASD1#W.

    Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj32613.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj32613.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj32613.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj32613.dita Thu Oct 3 17:20:10 2013 @@ -25,9 +25,11 @@ limitations under the License.

    RTRIM removes blanks from the end of a character string expression.

    -Syntax RTRIM(CharacterExpression)

    A -CharacterExpression is a CHAR, VARCHAR, or LONG VARCHAR data type, any built-in -type that is implicitly converted to a string.

    RTRIM returns NULL if CharacterExpression evaluates +Syntax +RTRIM ( characterExpression )

    A +characterExpression is a CHAR, VARCHAR, or LONG VARCHAR data type, any built-in +type that is implicitly converted to a string.

    +

    RTRIM returns NULL if characterExpression evaluates to null.

    Examples -- returns ' asdf' Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj32693.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj32693.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj32693.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj32693.dita Thu Oct 3 17:20:10 2013 @@ -27,12 +27,12 @@ limitations under the License.

    AVG is an aggregate function that evaluates the average of an expression over a set of rows (see ). AVG is allowed only on expressions that evaluate to numeric data types.

    -Syntax AVG ( [ DISTINCT | ALL ] Expression )

    DISTINCTqualifier +Syntax AVG ( [ DISTINCT | ALL ] expression )

    DISTINCTqualifier in AVG functionThe DISTINCT qualifier eliminates duplicates. The ALL qualifier retains duplicates. ALL is the default value if neither ALL nor DISTINCT is specified. For example, if a column contains the values 1.0, 1.0, 1.0, 1.0, and 2.0, AVG(col) returns a smaller value than AVG(DISTINCT -col).

    Only one DISTINCT aggregate expression per SelectExpression is +col).

    Only one DISTINCT aggregate expression per selectExpression is allowed. For example, the following query is not valid: SELECT AVG (DISTINCT flying_time), SUM (DISTINCT miles) FROM Flights

    The expression can contain multiple column references or expressions, but it cannot contain another aggregate or subquery. Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj33562.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj33562.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj33562.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj33562.dita Thu Oct 3 17:20:10 2013 @@ -29,8 +29,8 @@ function (explicit)

    CAST expressions are permitted anywhere expressions are permitted.

    -Syntax CAST ( [ Expression | NULL | ? ] - AS Datatype)

    The data type to which you are +Syntax CAST ( [ expression | NULL | ? ] + AS dataType )

    The data type to which you are casting an expression is the target type. The data type of the expression from which you are casting is the source type.

    CAST conversions among SQL-92 data types

    The following Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj38716.dita Thu Oct 3 17:20:10 2013 @@ -35,7 +35,7 @@ value than COUNT(DISTINCT col).

    On per selectExpression is allowed. For example, the following query is not allowed:

    -- query not allowed SELECT COUNT (DISTINCT flying_time), SUM (DISTINCT miles) -FROM Flights

    An Expression can contain multiple column +FROM Flights

    An expression can contain multiple column references or expressions, but it cannot contain another aggregate or subquery. If an expression evaluates to NULL, the aggregate is not processed for that value.

    The resulting data type of COUNT is INTEGER.

    Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj40899.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj40899.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj40899.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj40899.dita Thu Oct 3 17:20:10 2013 @@ -24,13 +24,14 @@ limitations under the License. Concatenation operator -

    The concatenation operator, ||, concatenates its right operand -to the end of its left operand. It operates on a character or bit expression.

    Because +

    +

    The concatenation operator, ||, concatenates its right operand +to the end of its left operand. It operates on character or bit expressions.

    Because all built-in data types are implicitly converted to strings, this function can act on all built-in data types.

    Syntax { - { CharacterExpression || CharacterExpression } | - { BitExpression || BitExpression } + characterExpression || characterExpression | + bitExpression || bitExpression }

    For character strings, if both the left and right operands are of type CHAR, the resulting type is CHAR; otherwise, it is VARCHAR. The normal blank padding/trimming rules for CHAR and VARCHAR apply to the result Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj42049.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj42049.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj42049.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj42049.dita Thu Oct 3 17:20:10 2013 @@ -26,13 +26,16 @@ limitations under the License.

    LCASE or LOWER takes a character expression as a parameter and returns a string in which all alpha characters have been converted to lowercase.

    -Syntax LCASE or LOWER ( CharacterExpression )

    A CharacterExpression is +Syntax +LCASE ( characterExpression ) +LOWER ( characterExpression ) +

    A characterExpression is a CHAR, VARCHAR, or LONG VARCHAR data type or any built-in type that is implicitly converted to a string (except a bit expression).

    If the parameter type is CHAR or LONG VARCHAR, the return type is CHAR or LONG VARCHAR. Otherwise, the return type is VARCHAR.

    The length and maximum length of the returned value are the same as the length and maximum length of the parameter.

    If -the CharacterExpression evaluates to null, this function returns null. +the characterExpression evaluates to null, this function returns null.

    Examples -- returns 'asd1#w' Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj61998.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj61998.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj61998.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj61998.dita Thu Oct 3 17:20:10 2013 @@ -29,16 +29,16 @@ limitations under the License. another string. If the desired string is found, LOCATE returns the index at which it is found. If the desired string is not found, LOCATE returns 0.

    -Syntax LOCATE(CharacterExpression, CharacterExpression [, StartPosition] ) - +Syntax +LOCATE ( characterExpression, characterExpression [ , startPosition ] )

    There are two required arguments to the LOCATE function, and a third optional argument.

      -
    • The first CharacterExpression specifies the string to +
    • The first characterExpression specifies the string to search for.
    • -
    • The second CharacterExpression specifies +
    • The second characterExpression specifies the string in which to search.
    • -
    • The third argument is the startPosition, and specifies +
    • The third argument is the startPosition, which specifies the position in the second argument at which the search is to start. If the third argument is not provided, the LOCATE function starts its search at the beginning of the second @@ -49,10 +49,10 @@ If the desired string is not found, LOCA second argument at which the first argument was first located. Index positions start with 1. If the first argument is not found in the second argument, LOCATE - returns 0. If the first argument is an empty string (''), LOCATE + returns 0. If the first argument is an empty string (''), LOCATE returns the value of the third argument (or 1 if it was not provided), even if the second argument is also an empty string. If a NULL - value is passed for either of the CharacterExpression arguments, + value is passed for either of the characterExpression arguments, NULL is returned.

      Examples Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj73147.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj73147.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj73147.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj73147.dita Thu Oct 3 17:20:10 2013 @@ -30,7 +30,8 @@ href="rrefsqlj27281.dita#rrefsqlj27281"> PRECISION are supported. The return type for SQRT is the type of the parameter.

      To execute SQRT on other data types, you must cast them to floating point types.
    -Syntax SQRT(FloatingPointExpression) +Syntax +SQRT ( number ) Examples -- throws an exception if any row stores a negative number: VALUES SQRT(3421E+09) Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj93082.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj93082.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj93082.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj93082.dita Thu Oct 3 17:20:10 2013 @@ -30,8 +30,9 @@ a bit string expression. The type of the the first case and VARCHAR FOR BIT DATA in the second case. The length of the result is the maximum length of the source type.

    -SyntaxSUBSTR({ CharacterExpression }, - StartPosition [, LengthOfString ] )

    The parameter startPosition and +Syntax +SUBSTR( characterExpression, startPosition [, lengthOfString ] ) +

    The parameter startPosition and the optional parameter lengthOfString are both integer expressions. The first character or bit has a startPosition of 1. If you specify 0, assumes that you @@ -49,10 +50,10 @@ The SUBSTR function returns an error if the parameter lengthOfString.

    Examples

    To return a substring of the word hello, starting at the second character and continuing until the end of the word, -use the following clause:VALUES SUBSTR('hello', 2)The +use the following clause:VALUES SUBSTR('hello', 2)The result is 'ello'.

    To return a substring of the word hello, starting at the first character and continuing for two characters, use the -following clause:VALUES SUBSTR('hello',1,2)The result +following clause:VALUES SUBSTR('hello',1,2)The result is 'he'.

    Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj97870.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj97870.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj97870.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj97870.dita Thu Oct 3 17:20:10 2013 @@ -26,9 +26,11 @@ limitations under the License.

    LTRIM removes blanks from the beginning of a character string expression.

    -Syntax LTRIM(CharacterExpression)

    A CharacterExpression is +Syntax +LTRIM ( characterExpression ) +

    A characterExpression is a CHAR, VARCHAR, or LONG VARCHAR data type, any built-in type that is implicitly -converted to a string.

    LTRIM returns NULL if CharacterExpression evaluates +converted to a string.

    LTRIM returns NULL if characterExpression evaluates to null.

    Example -- returns 'asdf ' Modified: db/derby/docs/branches/10.10/src/ref/rrefsqlj98067.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqlj98067.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqlj98067.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqlj98067.dita Thu Oct 3 17:20:10 2013 @@ -30,7 +30,9 @@ The return type is the type of parameter href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER, BIGINT, NUMERIC, REAL, and SMALLINT).

    -Syntax ABS(NumericExpression) +Syntax +ABS ( numericExpression ) +ABSVAL ( numericExpression ) Example -- returns 3 VALUES ABS(-3) Modified: db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentschema.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentschema.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentschema.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqljcurrentschema.dita Thu Oct 3 17:20:10 2013 @@ -27,11 +27,10 @@ limitations under the License.

    CURRENT SCHEMA returns the schema name used to qualify unqualified database object references.

    CURRENT SCHEMA and CURRENT SQLID are synonyms.

    These functions return a string of up to 128 characters.

    -Syntax CURRENT SCHEMA - --- or, alternately: - -CURRENT SQLID +Syntax +CURRENT SCHEMA +

    or, alternately

    +CURRENT SQLID
    Example -- Set the name column default to the current schema: CREATE TABLE mytable (id int, name VARCHAR(128) DEFAULT CURRENT SQLID) Modified: db/derby/docs/branches/10.10/src/ref/rrefsqljmod.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqljmod.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqljmod.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqljmod.dita Thu Oct 3 17:20:10 2013 @@ -26,7 +26,8 @@ limitations under the License.

    MOD returns the remainder (modulus) of argument 1 divided by argument 2. The result is negative only if argument 1 is negative.

    -Syntax mod(integer_type, integer_type)

    The +Syntax +MOD ( integerExpression, integerExpression )

    The result of the function is:

    • SMALLINT if both arguments are SMALLINT.
    • INTEGER if one argument is INTEGER and the other is INTEGER or SMALLINT.
    • Modified: db/derby/docs/branches/10.10/src/ref/rrefsqljtfinvoke.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rrefsqljtfinvoke.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rrefsqljtfinvoke.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rrefsqljtfinvoke.dita Thu Oct 3 17:20:10 2013 @@ -23,7 +23,8 @@ limitations under the License. -TABLE tableFunctionName( [ [ functionArg ] [, functionArg ]* ] ) +TABLE functionName( [ [ functionArg ] [, functionArg ]* ] )

      Note that when you invoke a table function, you must bind it to a Modified: db/derby/docs/branches/10.10/src/ref/rreftimestampfunc.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rreftimestampfunc.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rreftimestampfunc.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rreftimestampfunc.dita Thu Oct 3 17:20:10 2013 @@ -48,14 +48,16 @@ that timestamp. timestamp represented by that string. If the argument is a string of length 14, the timestamp has a microsecond part of zero.

    -SyntaxTIMESTAMP ( expression [, expression ] ) +Syntax +TIMESTAMP ( expression [ , expression ] ) Examples

    The second column in table records_table contains dates (such as 1998-12-25) and the third column contains times of day (such -as 17:12:30). You can return the timestamp with this statement:SELECT TIMESTAMP(col2, col3) FROM records_table

    The -following clause returns the value 1998-12-25-17:12:30.0:VALUES TIMESTAMP('1998-12-25', '17.12.30'); +as 17:12:30). You can return the timestamp with this statement: +SELECT TIMESTAMP(col2, col3) FROM records_table

    The +following clause returns the value 1998-12-25-17:12:30.0: +VALUES TIMESTAMP('1998-12-25', '17.12.30'); 1 -------------------------- -1998-12-25 17:12:30.0 -

    +1998-12-25 17:12:30.0

    Modified: db/derby/docs/branches/10.10/src/ref/rreftrimfunc.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/ref/rreftrimfunc.dita?rev=1528947&r1=1528946&r2=1528947&view=diff ============================================================================== --- db/derby/docs/branches/10.10/src/ref/rreftrimfunc.dita (original) +++ db/derby/docs/branches/10.10/src/ref/rreftrimfunc.dita Thu Oct 3 17:20:10 2013 @@ -26,31 +26,36 @@ limitations under the License.
    TRIM is a function that takes a character expression and returns that expression with leading and/or trailing pad characters removed. Optional parameters indicate whether leading, or trailing, or both leading and trailing pad characters should be removed, and specify the pad character that is to be removed.
    -Syntax TRIM( [ trimOperands ] trimSource) -

    - -trimOperands ::= { trimType [ trimCharacter ] FROM | trimCharacter FROM } -trimType ::= { LEADING | TRAILING | BOTH } -trimCharacter ::= CharacterExpression -trimSource ::= CharacterExpression - -

    -If trimType is not specified, it will default to BOTH. If trimCharacter is not specified, it will default to the space character (' '). Otherwise the trimCharacter expression must evaulate to one of the following: +Syntax +TRIM( [ trimOperands ] trimSource ) +

    The trimSource is a characterExpression.

    +
    +
    trimOperands +{ trimType [ trimCharacter ] FROM | trimCharacter FROM } +

    The trimCharacter is a characterExpression.

    +
    +
    trimType +{ LEADING | TRAILING | BOTH } +
    +
    +

    If trimType is not specified, it defaults to BOTH. If trimCharacter is not specified, it will default to the space character (' '). Otherwise the trimCharacter expression must evaulate to one of the following:

      -
    • a character string whose length is exactly one, or.
    • +
    • A character string whose length is exactly one
    • NULL

    If either trimCharacter or trimSource evaluates to NULL, the result of the TRIM function is NULL. Otherwise, the result of the TRIM function is defined as follows:

      -
    • If trimType is LEADING, the result will be the trimSource value with all leading occurrences of trimChar removed.
    • -
    • If trimType is TRAILING, the result will be the trimSource value with all trailing occurrences of trimChar removed.
    • -
    • If trimType is BOTH, the result will be the trimSource value with all leading *and* trailing occurrences of trimChar removed.
    • +
    • If trimType is LEADING, the result will be the trimSource value with all leading occurrences of trimCharacter removed.
    • +
    • If trimType is TRAILING, the result will be the trimSource value with all trailing occurrences of trimCharacter removed.
    • +
    • If trimType is BOTH, the result will be the trimSource value with all leading and trailing occurrences of trimCharacter removed.

    If trimSource's data type is CHAR or VARCHAR, the return type of the TRIM function will be VARCHAR. Otherwise the return type of the TRIM function will be CLOB.

    - +
    Examples

    -- returns 'derby' (no spaces)