You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2006/02/01 01:06:43 UTC
svn commit: r373948 - in /db/derby/code/trunk/java:
engine/org/apache/derby/impl/jdbc/ engine/org/apache/derby/impl/sql/compile/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testin...
Author: djd
Date: Tue Jan 31 16:06:34 2006
New Revision: 373948
URL: http://svn.apache.org/viewcvs?rev=373948&view=rev
Log:
DERBY-592 Provide a mechanism to map JDBC escape functions directly onto
builtin functions in the SYSFUN schema. Escape functions added are:
ACOS, ASIN, ATAN, COS, SIN, TAN, DEGREES, RADIANS, EXP, LOG, CEILING, FLOOR
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java Tue Jan 31 16:06:34 2006
@@ -426,7 +426,7 @@
* @return the list
*/
public String getNumericFunctions() {
- return "ABS,MOD,SQRT";
+ return "ABS,ACOS,ASIN,ATAN,CEILING,COS,DEGREES,EXP,FLOOR,LOG,MOD,RADIANS,SIN,SQRT,TAN";
}
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Tue Jan 31 16:06:34 2006
@@ -1,4 +1,3 @@
-
options
{
STATIC = false;
@@ -110,6 +109,7 @@
import org.apache.derby.iapi.sql.dictionary.TableDescriptor;
import org.apache.derby.iapi.sql.dictionary.TriggerDescriptor;
import org.apache.derby.iapi.sql.dictionary.ViewDescriptor;
+import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
import org.apache.derby.iapi.sql.conn.Authorizer;
import org.apache.derby.iapi.sql.execute.ConstantAction;
@@ -992,6 +992,32 @@
return getToken(2).kind == FN;
}
+
+
+ /**
+ List of JDBC escape functions that map directly onto
+ a function in the SYSFUN schema.
+ */
+ private static final String[] ESCAPED_SYSFUN_FUNCTIONS =
+ {"ACOS", "ASIN", "ATAN", "COS", "SIN", "TAN",
+ "DEGREES", "RADIANS", "EXP", "LOG", "CEILING", "FLOOR" };
+
+ /**
+ Convert a JDBC escaped function name to a function
+ name in the SYSFUC schema. Returns null if no such
+ function exists.
+ */
+ private String getEscapedSYSFUN(String name)
+ {
+ name = StringUtil.SQLToUpperCase(name);
+
+ for (int i = 0; i < ESCAPED_SYSFUN_FUNCTIONS.length; i++)
+ {
+ if (ESCAPED_SYSFUN_FUNCTIONS[i].equals(name))
+ return name;
+ }
+ return null;
+ }
/**
* Determine whether the next sequence of tokens can be the beginning
@@ -3283,7 +3309,9 @@
bareCallStatement() throws StandardException :
{
ParameterNode returnParam = null;
+
ValueNode value = null;
+
ResultSetNode resultSetNode = null;
}
{
@@ -5864,7 +5892,59 @@
{
return value;
}
+
+|
+ LOOKAHEAD({ getEscapedSYSFUN(getToken(1).image) != null })
+ value = escapedSYSFUNFunction()
+ {
+ return value;
+ }
+
+
+}
+
+/*
+ * <A NAME="numericValueFunction">numericValueFunction</A>
+ */
+ValueNode
+escapedSYSFUNFunction() throws StandardException :
+{
+ Vector parameterList = new Vector();
+ Token tok;
}
+{
+ tok = <IDENTIFIER> methodCallParameterList(parameterList)
+ {
+ String sysFunName = getEscapedSYSFUN(tok.image);
+
+ TableName functionName = (TableName) nodeFactory.getNode(
+ C_NodeTypes.TABLE_NAME,
+ SchemaDescriptor.IBM_SYSTEM_FUN_SCHEMA_NAME,
+ sysFunName,
+ new Integer(0),
+ new Integer(0),
+ getContextManager());
+
+ MethodCallNode methodNode = (MethodCallNode) nodeFactory.getNode(
+ C_NodeTypes.STATIC_METHOD_CALL_NODE,
+ functionName,
+ null,
+ getContextManager());
+
+ methodNode.addParms(parameterList);
+
+ /*
+ ** Assume this is being returned to the SQL domain. If it turns
+ ** out that this is being returned to the Java domain, we will
+ ** get rid of this node.
+ */
+ return (ValueNode) nodeFactory.getNode(
+ C_NodeTypes.JAVA_TO_SQL_VALUE_NODE,
+ methodNode,
+ getContextManager());
+ }
+}
+
/*
* <A NAME="timestampArithmeticFuncion">timestampArithmeticFuncion</A>
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out Tue Jan 31 16:06:34 2006
@@ -75,7 +75,7 @@
storesLowerCaseQuotedIdentifiers(): false
storesMixedCaseQuotedIdentifiers(): true
getIdentifierQuoteString(): "
-getNumericFunctions(): ABS,MOD,SQRT
+getNumericFunctions(): ABS,ACOS,ASIN,ATAN,CEILING,COS,DEGREES,EXP,FLOOR,LOG,MOD,RADIANS,SIN,SQRT,TAN
getStringFunctions(): CONCAT,LENGTH,LCASE,LOCATE,LTRIM,RTRIM,SUBSTRING,UCASE
getSystemFunctions(): USER
getTimeDateFunctions(): CURDATE,CURTIME,HOUR,MINUTE,MONTH,SECOND,TIMESTAMPADD,TIMESTAMPDIFF,YEAR
@@ -458,49 +458,37 @@
Test escaped numeric functions - JDBC 3.0 C.1
TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
Executing VALUES { fn ABS(-25.67) } -- = >25.67< <<
+Executing VALUES { fn ACOS(0.0707) } -- = >1.50< <<
+Executing VALUES { fn ASIN(0.997) } -- = >1.49< <<
+Executing VALUES { fn ATAN(14.10) } -- = >1.49< <<
+Executing VALUES { fn CEILING(3.45) } -- = >4.0< <<
+Executing VALUES { fn COS(1.2) } -- = >0.36< <<
+Executing VALUES { fn DEGREES(2.1) } -- = >120.< <<
+Executing VALUES { fn EXP(2.3) } -- = >9.97< <<
+Executing VALUES { fn FLOOR(3.22) } -- = >3.0< <<
+Executing VALUES { fn LOG(34.1) } -- = >3.52< <<
Executing VALUES { fn MOD(124, 7) } -- = >5< <<
+Executing VALUES { fn RADIANS(54) } -- = >0.94< <<
+Executing VALUES { fn SIN(0.32) } -- = >0.31< <<
Executing VALUES { fn SQRT(6.22) } -- = >2.49< <<
+Executing VALUES { fn TAN(0.57) } -- = >0.64< <<
TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
-Executing VALUES { fn ACOS(1.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
-Executing VALUES { fn ASIN(1.21) } --
-SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
-Executing VALUES { fn ATAN(0.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
Executing VALUES { fn ATAN2(0.56, 1.2) } --
SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
-Executing VALUES { fn CEILING(3.45) } --
-SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
-Executing VALUES { fn COS(1.2) } --
-SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
Executing VALUES { fn COT(3.4) } --
SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
-Executing VALUES { fn DEGREES(2.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
-Executing VALUES { fn EXP(2.3) } --
-SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
-Executing VALUES { fn FLOOR(3.22) } --
-SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
-Executing VALUES { fn LOG(34.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
Executing VALUES { fn LOG10(18.7) } --
SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
Executing VALUES { fn PI() } --
SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
Executing VALUES { fn POWER(2, 3) } --
SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
-Executing VALUES { fn RADIANS(54) } --
-SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
Executing VALUES { fn RAND(17) } --
SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
Executing VALUES { fn ROUND(345.345, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
Executing VALUES { fn SIGN(-34) } --
SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
-Executing VALUES { fn SIN(0.32) } --
-SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
-Executing VALUES { fn TAN(0.57) } --
-SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
Executing VALUES { fn TRUNCATE(345.395, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
Test escaped string functions - JDBC 3.0 C.2
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out Tue Jan 31 16:06:34 2006
@@ -105,7 +105,7 @@
storesLowerCaseQuotedIdentifiers(): false
storesMixedCaseQuotedIdentifiers(): true
getIdentifierQuoteString(): "
-getNumericFunctions(): ABS,MOD,SQRT
+getNumericFunctions(): ABS,ACOS,ASIN,ATAN,CEILING,COS,DEGREES,EXP,FLOOR,LOG,MOD,RADIANS,SIN,SQRT,TAN
getStringFunctions(): CONCAT,LENGTH,LCASE,LOCATE,LTRIM,RTRIM,SUBSTRING,UCASE
getSystemFunctions(): USER
getTimeDateFunctions(): CURDATE,CURTIME,HOUR,MINUTE,MONTH,SECOND,TIMESTAMPADD,TIMESTAMPDIFF,YEAR
@@ -489,49 +489,37 @@
Test escaped numeric functions - JDBC 3.0 C.1
TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
Executing VALUES { fn ABS(-25.67) } -- = >25.67< <<
+Executing VALUES { fn ACOS(0.0707) } -- = >1.50< <<
+Executing VALUES { fn ASIN(0.997) } -- = >1.49< <<
+Executing VALUES { fn ATAN(14.10) } -- = >1.49< <<
+Executing VALUES { fn CEILING(3.45) } -- = >4.0< <<
+Executing VALUES { fn COS(1.2) } -- = >0.36< <<
+Executing VALUES { fn DEGREES(2.1) } -- = >120.< <<
+Executing VALUES { fn EXP(2.3) } -- = >9.97< <<
+Executing VALUES { fn FLOOR(3.22) } -- = >3.0< <<
+Executing VALUES { fn LOG(34.1) } -- = >3.52< <<
Executing VALUES { fn MOD(124, 7) } -- = >5< <<
+Executing VALUES { fn RADIANS(54) } -- = >0.94< <<
+Executing VALUES { fn SIN(0.32) } -- = >0.31< <<
Executing VALUES { fn SQRT(6.22) } -- = >2.49< <<
+Executing VALUES { fn TAN(0.57) } -- = >0.64< <<
TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
-Executing VALUES { fn ACOS(1.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
-Executing VALUES { fn ASIN(1.21) } --
-SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
-Executing VALUES { fn ATAN(0.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
Executing VALUES { fn ATAN2(0.56, 1.2) } --
SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
-Executing VALUES { fn CEILING(3.45) } --
-SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
-Executing VALUES { fn COS(1.2) } --
-SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
Executing VALUES { fn COT(3.4) } --
SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
-Executing VALUES { fn DEGREES(2.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
-Executing VALUES { fn EXP(2.3) } --
-SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
-Executing VALUES { fn FLOOR(3.22) } --
-SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
-Executing VALUES { fn LOG(34.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
Executing VALUES { fn LOG10(18.7) } --
SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
Executing VALUES { fn PI() } --
SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
Executing VALUES { fn POWER(2, 3) } --
SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
-Executing VALUES { fn RADIANS(54) } --
-SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
Executing VALUES { fn RAND(17) } --
SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
Executing VALUES { fn ROUND(345.345, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
Executing VALUES { fn SIGN(-34) } --
SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
-Executing VALUES { fn SIN(0.32) } --
-SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
-Executing VALUES { fn TAN(0.57) } --
-SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
Executing VALUES { fn TRUNCATE(345.395, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
Test escaped string functions - JDBC 3.0 C.2
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/metadata.out Tue Jan 31 16:06:34 2006
@@ -75,7 +75,7 @@
storesLowerCaseQuotedIdentifiers(): false
storesMixedCaseQuotedIdentifiers(): true
getIdentifierQuoteString(): "
-getNumericFunctions(): ABS,MOD,SQRT
+getNumericFunctions(): ABS,ACOS,ASIN,ATAN,CEILING,COS,DEGREES,EXP,FLOOR,LOG,MOD,RADIANS,SIN,SQRT,TAN
getStringFunctions(): CONCAT,LENGTH,LCASE,LOCATE,LTRIM,RTRIM,SUBSTRING,UCASE
getSystemFunctions(): USER
getTimeDateFunctions(): CURDATE,CURTIME,HOUR,MINUTE,MONTH,SECOND,TIMESTAMPADD,TIMESTAMPDIFF,YEAR
@@ -458,49 +458,37 @@
Test escaped numeric functions - JDBC 3.0 C.1
TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
Executing VALUES { fn ABS(-25.67) } -- = >25.67< <<
+Executing VALUES { fn ACOS(0.0707) } -- = >1.50< <<
+Executing VALUES { fn ASIN(0.997) } -- = >1.49< <<
+Executing VALUES { fn ATAN(14.10) } -- = >1.49< <<
+Executing VALUES { fn CEILING(3.45) } -- = >4.0< <<
+Executing VALUES { fn COS(1.2) } -- = >0.36< <<
+Executing VALUES { fn DEGREES(2.1) } -- = >120.< <<
+Executing VALUES { fn EXP(2.3) } -- = >9.97< <<
+Executing VALUES { fn FLOOR(3.22) } -- = >3.0< <<
+Executing VALUES { fn LOG(34.1) } -- = >3.52< <<
Executing VALUES { fn MOD(124, 7) } -- = >5< <<
+Executing VALUES { fn RADIANS(54) } -- = >0.94< <<
+Executing VALUES { fn SIN(0.32) } -- = >0.31< <<
Executing VALUES { fn SQRT(6.22) } -- = >2.49< <<
+Executing VALUES { fn TAN(0.57) } -- = >0.64< <<
TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
-Executing VALUES { fn ACOS(1.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
-Executing VALUES { fn ASIN(1.21) } --
-SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
-Executing VALUES { fn ATAN(0.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
Executing VALUES { fn ATAN2(0.56, 1.2) } --
SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
-Executing VALUES { fn CEILING(3.45) } --
-SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
-Executing VALUES { fn COS(1.2) } --
-SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
Executing VALUES { fn COT(3.4) } --
SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
-Executing VALUES { fn DEGREES(2.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
-Executing VALUES { fn EXP(2.3) } --
-SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
-Executing VALUES { fn FLOOR(3.22) } --
-SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
-Executing VALUES { fn LOG(34.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
Executing VALUES { fn LOG10(18.7) } --
SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
Executing VALUES { fn PI() } --
SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
Executing VALUES { fn POWER(2, 3) } --
SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
-Executing VALUES { fn RADIANS(54) } --
-SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
Executing VALUES { fn RAND(17) } --
SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
Executing VALUES { fn ROUND(345.345, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
Executing VALUES { fn SIGN(-34) } --
SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
-Executing VALUES { fn SIN(0.32) } --
-SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
-Executing VALUES { fn TAN(0.57) } --
-SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
Executing VALUES { fn TRUNCATE(345.395, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
Test escaped string functions - JDBC 3.0 C.2
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out Tue Jan 31 16:06:34 2006
@@ -75,7 +75,7 @@
storesLowerCaseQuotedIdentifiers(): false
storesMixedCaseQuotedIdentifiers(): true
getIdentifierQuoteString(): "
-getNumericFunctions(): ABS,MOD,SQRT
+getNumericFunctions(): ABS,ACOS,ASIN,ATAN,CEILING,COS,DEGREES,EXP,FLOOR,LOG,MOD,RADIANS,SIN,SQRT,TAN
getStringFunctions(): CONCAT,LENGTH,LCASE,LOCATE,LTRIM,RTRIM,SUBSTRING,UCASE
getSystemFunctions(): USER
getTimeDateFunctions(): CURDATE,CURTIME,HOUR,MINUTE,MONTH,SECOND,TIMESTAMPADD,TIMESTAMPDIFF,YEAR
@@ -458,49 +458,37 @@
Test escaped numeric functions - JDBC 3.0 C.1
TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
Executing VALUES { fn ABS(-25.67) } -- = >25.67< <<
+Executing VALUES { fn ACOS(0.0707) } -- = >1.50< <<
+Executing VALUES { fn ASIN(0.997) } -- = >1.49< <<
+Executing VALUES { fn ATAN(14.10) } -- = >1.49< <<
+Executing VALUES { fn CEILING(3.45) } -- = >4.0< <<
+Executing VALUES { fn COS(1.2) } -- = >0.36< <<
+Executing VALUES { fn DEGREES(2.1) } -- = >120.< <<
+Executing VALUES { fn EXP(2.3) } -- = >9.97< <<
+Executing VALUES { fn FLOOR(3.22) } -- = >3.0< <<
+Executing VALUES { fn LOG(34.1) } -- = >3.52< <<
Executing VALUES { fn MOD(124, 7) } -- = >5< <<
+Executing VALUES { fn RADIANS(54) } -- = >0.94< <<
+Executing VALUES { fn SIN(0.32) } -- = >0.31< <<
Executing VALUES { fn SQRT(6.22) } -- = >2.49< <<
+Executing VALUES { fn TAN(0.57) } -- = >0.64< <<
TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
-Executing VALUES { fn ACOS(1.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
-Executing VALUES { fn ASIN(1.21) } --
-SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
-Executing VALUES { fn ATAN(0.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
Executing VALUES { fn ATAN2(0.56, 1.2) } --
SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
-Executing VALUES { fn CEILING(3.45) } --
-SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
-Executing VALUES { fn COS(1.2) } --
-SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
Executing VALUES { fn COT(3.4) } --
SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
-Executing VALUES { fn DEGREES(2.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
-Executing VALUES { fn EXP(2.3) } --
-SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
-Executing VALUES { fn FLOOR(3.22) } --
-SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
-Executing VALUES { fn LOG(34.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
Executing VALUES { fn LOG10(18.7) } --
SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
Executing VALUES { fn PI() } --
SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
Executing VALUES { fn POWER(2, 3) } --
SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
-Executing VALUES { fn RADIANS(54) } --
-SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
Executing VALUES { fn RAND(17) } --
SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
Executing VALUES { fn ROUND(345.345, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
Executing VALUES { fn SIGN(-34) } --
SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
-Executing VALUES { fn SIN(0.32) } --
-SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
-Executing VALUES { fn TAN(0.57) } --
-SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
Executing VALUES { fn TRUNCATE(345.395, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
Test escaped string functions - JDBC 3.0 C.2
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out Tue Jan 31 16:06:34 2006
@@ -105,7 +105,7 @@
storesLowerCaseQuotedIdentifiers(): false
storesMixedCaseQuotedIdentifiers(): true
getIdentifierQuoteString(): "
-getNumericFunctions(): ABS,MOD,SQRT
+getNumericFunctions(): ABS,ACOS,ASIN,ATAN,CEILING,COS,DEGREES,EXP,FLOOR,LOG,MOD,RADIANS,SIN,SQRT,TAN
getStringFunctions(): CONCAT,LENGTH,LCASE,LOCATE,LTRIM,RTRIM,SUBSTRING,UCASE
getSystemFunctions(): USER
getTimeDateFunctions(): CURDATE,CURTIME,HOUR,MINUTE,MONTH,SECOND,TIMESTAMPADD,TIMESTAMPDIFF,YEAR
@@ -489,49 +489,37 @@
Test escaped numeric functions - JDBC 3.0 C.1
TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
Executing VALUES { fn ABS(-25.67) } -- = >25.67< <<
+Executing VALUES { fn ACOS(0.0707) } -- = >1.50< <<
+Executing VALUES { fn ASIN(0.997) } -- = >1.49< <<
+Executing VALUES { fn ATAN(14.10) } -- = >1.49< <<
+Executing VALUES { fn CEILING(3.45) } -- = >4.0< <<
+Executing VALUES { fn COS(1.2) } -- = >0.36< <<
+Executing VALUES { fn DEGREES(2.1) } -- = >120.< <<
+Executing VALUES { fn EXP(2.3) } -- = >9.97< <<
+Executing VALUES { fn FLOOR(3.22) } -- = >3.0< <<
+Executing VALUES { fn LOG(34.1) } -- = >3.52< <<
Executing VALUES { fn MOD(124, 7) } -- = >5< <<
+Executing VALUES { fn RADIANS(54) } -- = >0.94< <<
+Executing VALUES { fn SIN(0.32) } -- = >0.31< <<
Executing VALUES { fn SQRT(6.22) } -- = >2.49< <<
+Executing VALUES { fn TAN(0.57) } -- = >0.64< <<
TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
-Executing VALUES { fn ACOS(1.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
-Executing VALUES { fn ASIN(1.21) } --
-SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
-Executing VALUES { fn ATAN(0.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
Executing VALUES { fn ATAN2(0.56, 1.2) } --
SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
-Executing VALUES { fn CEILING(3.45) } --
-SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
-Executing VALUES { fn COS(1.2) } --
-SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
Executing VALUES { fn COT(3.4) } --
SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
-Executing VALUES { fn DEGREES(2.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
-Executing VALUES { fn EXP(2.3) } --
-SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
-Executing VALUES { fn FLOOR(3.22) } --
-SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
-Executing VALUES { fn LOG(34.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
Executing VALUES { fn LOG10(18.7) } --
SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
Executing VALUES { fn PI() } --
SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
Executing VALUES { fn POWER(2, 3) } --
SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
-Executing VALUES { fn RADIANS(54) } --
-SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
Executing VALUES { fn RAND(17) } --
SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
Executing VALUES { fn ROUND(345.345, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
Executing VALUES { fn SIGN(-34) } --
SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
-Executing VALUES { fn SIN(0.32) } --
-SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
-Executing VALUES { fn TAN(0.57) } --
-SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
Executing VALUES { fn TRUNCATE(345.395, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
Test escaped string functions - JDBC 3.0 C.2
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/metadata.out Tue Jan 31 16:06:34 2006
@@ -75,7 +75,7 @@
storesLowerCaseQuotedIdentifiers(): false
storesMixedCaseQuotedIdentifiers(): true
getIdentifierQuoteString(): "
-getNumericFunctions(): ABS,MOD,SQRT
+getNumericFunctions(): ABS,ACOS,ASIN,ATAN,CEILING,COS,DEGREES,EXP,FLOOR,LOG,MOD,RADIANS,SIN,SQRT,TAN
getStringFunctions(): CONCAT,LENGTH,LCASE,LOCATE,LTRIM,RTRIM,SUBSTRING,UCASE
getSystemFunctions(): USER
getTimeDateFunctions(): CURDATE,CURTIME,HOUR,MINUTE,MONTH,SECOND,TIMESTAMPADD,TIMESTAMPDIFF,YEAR
@@ -458,49 +458,37 @@
Test escaped numeric functions - JDBC 3.0 C.1
TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
Executing VALUES { fn ABS(-25.67) } -- = >25.67< <<
+Executing VALUES { fn ACOS(0.0707) } -- = >1.50< <<
+Executing VALUES { fn ASIN(0.997) } -- = >1.49< <<
+Executing VALUES { fn ATAN(14.10) } -- = >1.49< <<
+Executing VALUES { fn CEILING(3.45) } -- = >4.0< <<
+Executing VALUES { fn COS(1.2) } -- = >0.36< <<
+Executing VALUES { fn DEGREES(2.1) } -- = >120.< <<
+Executing VALUES { fn EXP(2.3) } -- = >9.97< <<
+Executing VALUES { fn FLOOR(3.22) } -- = >3.0< <<
+Executing VALUES { fn LOG(34.1) } -- = >3.52< <<
Executing VALUES { fn MOD(124, 7) } -- = >5< <<
+Executing VALUES { fn RADIANS(54) } -- = >0.94< <<
+Executing VALUES { fn SIN(0.32) } -- = >0.31< <<
Executing VALUES { fn SQRT(6.22) } -- = >2.49< <<
+Executing VALUES { fn TAN(0.57) } -- = >0.64< <<
TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
-Executing VALUES { fn ACOS(1.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
-Executing VALUES { fn ASIN(1.21) } --
-SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
-Executing VALUES { fn ATAN(0.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
Executing VALUES { fn ATAN2(0.56, 1.2) } --
SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
-Executing VALUES { fn CEILING(3.45) } --
-SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
-Executing VALUES { fn COS(1.2) } --
-SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
Executing VALUES { fn COT(3.4) } --
SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
-Executing VALUES { fn DEGREES(2.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
-Executing VALUES { fn EXP(2.3) } --
-SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
-Executing VALUES { fn FLOOR(3.22) } --
-SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
-Executing VALUES { fn LOG(34.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
Executing VALUES { fn LOG10(18.7) } --
SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
Executing VALUES { fn PI() } --
SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
Executing VALUES { fn POWER(2, 3) } --
SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
-Executing VALUES { fn RADIANS(54) } --
-SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
Executing VALUES { fn RAND(17) } --
SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
Executing VALUES { fn ROUND(345.345, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
Executing VALUES { fn SIGN(-34) } --
SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
-Executing VALUES { fn SIN(0.32) } --
-SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
-Executing VALUES { fn TAN(0.57) } --
-SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
Executing VALUES { fn TRUNCATE(345.395, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
Test escaped string functions - JDBC 3.0 C.2
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out Tue Jan 31 16:06:34 2006
@@ -75,7 +75,7 @@
storesLowerCaseQuotedIdentifiers(): false
storesMixedCaseQuotedIdentifiers(): true
getIdentifierQuoteString(): "
-getNumericFunctions(): ABS,MOD,SQRT
+getNumericFunctions(): ABS,ACOS,ASIN,ATAN,CEILING,COS,DEGREES,EXP,FLOOR,LOG,MOD,RADIANS,SIN,SQRT,TAN
getStringFunctions(): CONCAT,LENGTH,LCASE,LOCATE,LTRIM,RTRIM,SUBSTRING,UCASE
getSystemFunctions(): USER
getTimeDateFunctions(): CURDATE,CURTIME,HOUR,MINUTE,MONTH,SECOND,TIMESTAMPADD,TIMESTAMPDIFF,YEAR
@@ -458,49 +458,37 @@
Test escaped numeric functions - JDBC 3.0 C.1
TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
Executing VALUES { fn ABS(-25.67) } -- = >25.67< <<
+Executing VALUES { fn ACOS(0.0707) } -- = >1.50< <<
+Executing VALUES { fn ASIN(0.997) } -- = >1.49< <<
+Executing VALUES { fn ATAN(14.10) } -- = >1.49< <<
+Executing VALUES { fn CEILING(3.45) } -- = >4.0< <<
+Executing VALUES { fn COS(1.2) } -- = >0.36< <<
+Executing VALUES { fn DEGREES(2.1) } -- = >120.< <<
+Executing VALUES { fn EXP(2.3) } -- = >9.97< <<
+Executing VALUES { fn FLOOR(3.22) } -- = >3.0< <<
+Executing VALUES { fn LOG(34.1) } -- = >3.52< <<
Executing VALUES { fn MOD(124, 7) } -- = >5< <<
+Executing VALUES { fn RADIANS(54) } -- = >0.94< <<
+Executing VALUES { fn SIN(0.32) } -- = >0.31< <<
Executing VALUES { fn SQRT(6.22) } -- = >2.49< <<
+Executing VALUES { fn TAN(0.57) } -- = >0.64< <<
TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
-Executing VALUES { fn ACOS(1.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
-Executing VALUES { fn ASIN(1.21) } --
-SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
-Executing VALUES { fn ATAN(0.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
Executing VALUES { fn ATAN2(0.56, 1.2) } --
SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
-Executing VALUES { fn CEILING(3.45) } --
-SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
-Executing VALUES { fn COS(1.2) } --
-SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
Executing VALUES { fn COT(3.4) } --
SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
-Executing VALUES { fn DEGREES(2.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
-Executing VALUES { fn EXP(2.3) } --
-SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
-Executing VALUES { fn FLOOR(3.22) } --
-SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
-Executing VALUES { fn LOG(34.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
Executing VALUES { fn LOG10(18.7) } --
SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
Executing VALUES { fn PI() } --
SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
Executing VALUES { fn POWER(2, 3) } --
SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
-Executing VALUES { fn RADIANS(54) } --
-SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
Executing VALUES { fn RAND(17) } --
SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
Executing VALUES { fn ROUND(345.345, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
Executing VALUES { fn SIGN(-34) } --
SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
-Executing VALUES { fn SIN(0.32) } --
-SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
-Executing VALUES { fn TAN(0.57) } --
-SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
Executing VALUES { fn TRUNCATE(345.395, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
Test escaped string functions - JDBC 3.0 C.2
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out Tue Jan 31 16:06:34 2006
@@ -105,7 +105,7 @@
storesLowerCaseQuotedIdentifiers(): false
storesMixedCaseQuotedIdentifiers(): true
getIdentifierQuoteString(): "
-getNumericFunctions(): ABS,MOD,SQRT
+getNumericFunctions(): ABS,ACOS,ASIN,ATAN,CEILING,COS,DEGREES,EXP,FLOOR,LOG,MOD,RADIANS,SIN,SQRT,TAN
getStringFunctions(): CONCAT,LENGTH,LCASE,LOCATE,LTRIM,RTRIM,SUBSTRING,UCASE
getSystemFunctions(): USER
getTimeDateFunctions(): CURDATE,CURTIME,HOUR,MINUTE,MONTH,SECOND,TIMESTAMPADD,TIMESTAMPDIFF,YEAR
@@ -489,49 +489,37 @@
Test escaped numeric functions - JDBC 3.0 C.1
TEST FUNCTIONS DECLARED IN DATABASEMETADATA LIST
Executing VALUES { fn ABS(-25.67) } -- = >25.67< <<
+Executing VALUES { fn ACOS(0.0707) } -- = >1.50< <<
+Executing VALUES { fn ASIN(0.997) } -- = >1.49< <<
+Executing VALUES { fn ATAN(14.10) } -- = >1.49< <<
+Executing VALUES { fn CEILING(3.45) } -- = >4.0< <<
+Executing VALUES { fn COS(1.2) } -- = >0.36< <<
+Executing VALUES { fn DEGREES(2.1) } -- = >120.< <<
+Executing VALUES { fn EXP(2.3) } -- = >9.97< <<
+Executing VALUES { fn FLOOR(3.22) } -- = >3.0< <<
+Executing VALUES { fn LOG(34.1) } -- = >3.52< <<
Executing VALUES { fn MOD(124, 7) } -- = >5< <<
+Executing VALUES { fn RADIANS(54) } -- = >0.94< <<
+Executing VALUES { fn SIN(0.32) } -- = >0.31< <<
Executing VALUES { fn SQRT(6.22) } -- = >2.49< <<
+Executing VALUES { fn TAN(0.57) } -- = >0.64< <<
TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
-Executing VALUES { fn ACOS(1.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ACOS" at line 1, column 13.
-Executing VALUES { fn ASIN(1.21) } --
-SQLSTATE(42X01): Syntax error: Encountered "ASIN" at line 1, column 13.
-Executing VALUES { fn ATAN(0.34) } --
-SQLSTATE(42X01): Syntax error: Encountered "ATAN" at line 1, column 13.
Executing VALUES { fn ATAN2(0.56, 1.2) } --
SQLSTATE(42X01): Syntax error: Encountered "ATAN2" at line 1, column 13.
-Executing VALUES { fn CEILING(3.45) } --
-SQLSTATE(42X01): Syntax error: Encountered "CEILING" at line 1, column 13.
-Executing VALUES { fn COS(1.2) } --
-SQLSTATE(42X01): Syntax error: Encountered "COS" at line 1, column 13.
Executing VALUES { fn COT(3.4) } --
SQLSTATE(42X01): Syntax error: Encountered "COT" at line 1, column 13.
-Executing VALUES { fn DEGREES(2.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "DEGREES" at line 1, column 13.
-Executing VALUES { fn EXP(2.3) } --
-SQLSTATE(42X01): Syntax error: Encountered "EXP" at line 1, column 13.
-Executing VALUES { fn FLOOR(3.22) } --
-SQLSTATE(42X01): Syntax error: Encountered "FLOOR" at line 1, column 13.
-Executing VALUES { fn LOG(34.1) } --
-SQLSTATE(42X01): Syntax error: Encountered "LOG" at line 1, column 13.
Executing VALUES { fn LOG10(18.7) } --
SQLSTATE(42X01): Syntax error: Encountered "LOG10" at line 1, column 13.
Executing VALUES { fn PI() } --
SQLSTATE(42X01): Syntax error: Encountered "PI" at line 1, column 13.
Executing VALUES { fn POWER(2, 3) } --
SQLSTATE(42X01): Syntax error: Encountered "POWER" at line 1, column 13.
-Executing VALUES { fn RADIANS(54) } --
-SQLSTATE(42X01): Syntax error: Encountered "RADIANS" at line 1, column 13.
Executing VALUES { fn RAND(17) } --
SQLSTATE(42X01): Syntax error: Encountered "RAND" at line 1, column 13.
Executing VALUES { fn ROUND(345.345, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "ROUND" at line 1, column 13.
Executing VALUES { fn SIGN(-34) } --
SQLSTATE(42X01): Syntax error: Encountered "SIGN" at line 1, column 13.
-Executing VALUES { fn SIN(0.32) } --
-SQLSTATE(42X01): Syntax error: Encountered "SIN" at line 1, column 13.
-Executing VALUES { fn TAN(0.57) } --
-SQLSTATE(42X01): Syntax error: Encountered "TAN" at line 1, column 13.
Executing VALUES { fn TRUNCATE(345.395, 1) } --
SQLSTATE(42X01): Syntax error: Encountered "TRUNCATE" at line 1, column 13.
Test escaped string functions - JDBC 3.0 C.2
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java?rev=373948&r1=373947&r2=373948&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java Tue Jan 31 16:06:34 2006
@@ -96,9 +96,9 @@
{
// Section C.1 JDBC 3.0 spec.
{ "ABS", "-25.67" },
- { "ACOS", "1.34" },
- { "ASIN", "1.21" },
- { "ATAN", "0.34" },
+ { "ACOS", "0.0707" },
+ { "ASIN", "0.997" },
+ { "ATAN", "14.10" },
{ "ATAN2", "0.56", "1.2" },
{ "CEILING", "3.45" },
{ "COS", "1.2" },