db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r728691 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql: catalog/DataDictionaryImpl.java compile/SpecialFunctionNode.java
Date Mon, 22 Dec 2008 13:46:02 GMT
Author: dag
Date: Mon Dec 22 05:46:02 2008
New Revision: 728691

URL: http://svn.apache.org/viewvc?rev=728691&view=rev
Log:
DERBY-3137 SQL roles: add catalog support

Patch DERBY-3137-current_role_type which brings the result type of
CURRENT_ROLE in line with reality now that it will return a possibly
quoted SQL identifier rather than internal case normal form, cf. patch
DERBY-3137-setRoleNoCNF.


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=728691&r1=728690&r2=728691&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
Mon Dec 22 05:46:02 2008
@@ -12210,7 +12210,7 @@
 	/**
 	 * Get the target role by searching for a matching row
 	 * in SYSROLES by rolename, grantee and grantor.  Read only scan.
-     * Uses index on roleid, grantee and grantor columns.
+	 * Uses index on roleid, grantee and grantor columns.
 	 *
 	 * @param roleName	    The name of the role we're interested in.
 	 * @param grantee       The grantee

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java?rev=728691&r1=728690&r2=728691&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java
Mon Dec 22 05:46:02 2008
@@ -161,7 +161,9 @@
 			methodName = "getCurrentRoleIdDelimited";
 			methodType = "java.lang.String";
 			dtd = DataTypeDescriptor.getBuiltInDataTypeDescriptor(
-				Types.VARCHAR, true, 128);
+				// size: 2+(2*128) start and end text quote plus max # of
+				// escapes
+				Types.VARCHAR, true, 2+(2*128)); 
 			//SQL spec Section 6.4 Syntax Rule 4 says that the collation type
 			//of these functions will be the collation of character set
 			//SQL_IDENTIFIER. In Derby's case, that will mean, the collation of



Mime
View raw message