You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/11/30 16:10:27 UTC

[1/2] incubator-trafodion git commit: [TRAFODION-2378] Update Messages Guide for messages 1002-1015

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master dff04c6fb -> 5eca45d9d


[TRAFODION-2378] Update Messages Guide for messages 1002-1015


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/10b055ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/10b055ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/10b055ea

Branch: refs/heads/master
Commit: 10b055ea3962e2722ddda8088708c09a1554a1eb
Parents: bbbd26e
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Nov 30 00:07:20 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Nov 30 00:07:20 2016 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                    |  6 +-
 core/sql/optimizer/BindItemExpr.cpp             |  3 +-
 core/sql/optimizer/BindRelExpr.cpp              |  9 +--
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |  4 +-
 .../src/asciidoc/_chapters/ddl_msgs.adoc        | 84 +++++++++-----------
 5 files changed, 46 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10b055ea/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index e4dda67..6379d48 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -1,11 +1,11 @@
 100  02000 99999 UUUUUUUU UUUUU UUUUUUU The "no data" completion condition (SQLCODE = +100).
 1000 42000 99999 BEGINNER INFRM LOGONLY A syntax error occurred.
 1001 ZZZZZ 99999 ADVANCED CRTCL DIALOUT An internal error occurred in module $0~String0 on line $1~Int0.  DETAILS($2~String1).
-1002 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Catalog $0~CatalogName does not exist or has not been registered on node $1~String0.
+1002 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Catalog $0~CatalogName does not exist.
 1003 ZZZZZ 99999 BEGINNER MINOR DBADMIN Schema $0~SchemaName does not exist.
 1004 ZZZZZ 99999 BEGINNER MINOR DBADMIN Object $0~TableName does not exist or object type is invalid for the current operation.
 1005 ZZZZZ 99999 BEGINNER MINOR DBADMIN Constraint $0~ConstraintName does not exist.
-1006 ZZZZZ 99999 BEGINNER MINOR DBADMIN Index $0~TableName does not exist.
+1006 ZZZZZ 99999 BEGINNER MINOR DBADMIN --- unused ---
 1007 ZZZZZ 99999 ADVANCED MAJOR DBADMIN The WITH GRANT OPTION is not supported.
 1008 ZZZZZ 99999 BEGINNER MINOR DBADMIN Authorization identifier $0~String0 does not exist.
 1009 ZZZZZ 99999 BEGINNER MINOR DBADMIN Column $0~ColumnName does not exist in the specified table.
@@ -13,7 +13,7 @@
 1011 ZZZZZ 99999 ADVANCED MINOR DBADMIN Only one grantee per grant or revoke is allowed.
 1012 01007 99999 BEGINNER MAJOR DBADMIN No privileges were granted.  You lack grant option on the specified privileges.
 1013 01007 99999 BEGINNER MAJOR DBADMIN Not all privileges were granted.  You lack grant option for the $0~string0 privilege.
-1014 2B000 99999 BEGINNER MAJOR DBADMIN Privileges were not revoked.  Dependent privilege descriptors still exist.
+1014 2B000 99999 BEGINNER MAJOR DBADMIN --- unused ---
 1015 01006 99999 BEGINNER MAJOR DBADMIN Not all privileges were revoked. You lack the grant option for the $0~string0 privilege.
 1016 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Redundant references to column $0~ColumnName were specified in the constraint or trigger definition.
 1017 ZZZZZ 99999 BEGINNER MAJOR DBADMIN You are not authorized to perform this operation.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10b055ea/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindItemExpr.cpp b/core/sql/optimizer/BindItemExpr.cpp
index d145a18..bd2b53f 100644
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@ -9288,8 +9288,7 @@ ItemExpr *UDFunction::bindNode(BindWA *bindWA)
       {
 	*CmpCommon::diags()
 	  << DgSqlCode(-1002)
-	  << DgCatalogName(functionName1AsQualName.getCatalogName())
-	  << DgString0("");
+	  << DgCatalogName(functionName1AsQualName.getCatalogName());
 	
 	bindWA->setErrStatus();
 	return NULL;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10b055ea/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindRelExpr.cpp b/core/sql/optimizer/BindRelExpr.cpp
index 7348228..0bafc5f 100644
--- a/core/sql/optimizer/BindRelExpr.cpp
+++ b/core/sql/optimizer/BindRelExpr.cpp
@@ -16058,8 +16058,7 @@ RelExpr *CallSP::bindNode(BindWA *bindWA)
       {
 	*CmpCommon::diags()
 	  << DgSqlCode(-1002)
-	  << DgCatalogName(name.getCatalogName())
-	  << DgString0("");
+	  << DgCatalogName(name.getCatalogName());
 	
 	bindWA->setErrStatus();
 	return NULL;
@@ -16089,8 +16088,7 @@ RelExpr *CallSP::bindNode(BindWA *bindWA)
       {
 	*CmpCommon::diags()
 	  << DgSqlCode(-1002)
-	  << DgCatalogName(getRoutineName().getCatalogName())
-	  << DgString0("");
+	  << DgCatalogName(getRoutineName().getCatalogName());
 	
 	bindWA->setErrStatus();
 	return NULL;
@@ -16917,8 +16915,7 @@ RelExpr *TableMappingUDF::bindNode(BindWA *bindWA)
       {
 	*CmpCommon::diags()
 	  << DgSqlCode(-1002)
-	  << DgCatalogName(name.getCatalogName())
-	  << DgString0("");
+	  << DgCatalogName(name.getCatalogName());
 	
 	bindWA->setErrStatus();
 	return NULL;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10b055ea/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpDDLCatErrorCodes.h b/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
index 55d0468..d4bbf25 100644
--- a/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
+++ b/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
@@ -38,7 +38,7 @@ enum CatErrorCode { CAT_FIRST_ERROR = 1000
                   , CAT_SCHEMA_DOES_NOT_EXIST_ERROR               = 1003
                   , CAT_TABLE_DOES_NOT_EXIST_ERROR                = 1004
                   , CAT_CONSTRAINT_DOES_NOT_EXIST_ERROR           = 1005
-                  , CAT_INDEX_DOES_NOT_EXIST_ERROR                = 1006
+                  // , CAT_INDEX_DOES_NOT_EXIST_ERROR             = 1006 no longer used
                   , CAT_WGO_NOT_ALLOWED                           = 1007
                   , CAT_AUTHID_DOES_NOT_EXIST_ERROR               = 1008
                   , CAT_COLUMN_DOES_NOT_EXIST_ERROR               = 1009
@@ -46,7 +46,7 @@ enum CatErrorCode { CAT_FIRST_ERROR = 1000
                   , CAT_ONLY_ONE_GRANTEE_ALLOWED                  = 1011
                   , CAT_PRIVILEGE_NOT_GRANTED                     = 1012
                   , CAT_NOT_ALL_PRIVILEGES_GRANTED                = 1013
-                  , CAT_DEPENDENT_PRIVILEGES_EXIST                = 1014
+                  // , CAT_DEPENDENT_PRIVILEGES_EXIST             = 1014 no longer used
                   , CAT_NOT_ALL_PRIVILEGES_REVOKED                = 1015
                   , CAT_REDUNDANT_COLUMN_REF_PK                   = 1016
                   , CAT_NOT_AUTHORIZED                            = 1017

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/10b055ea/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
index 9b6bef7..b5bec6c 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
@@ -30,21 +30,16 @@
 == SQL 1002
 
 ```
-Catalog <catalog> does not exist or has not been registered on node <node>.
+Catalog <catalog> does not exist.
 ```
 
 Where <catalog> is the ANSI name of the target catalog.
 
-Where <node> is the node where the process executes.
-
-*Cause:* The catalog is not visible on the local node, either because it
-does not exist or because it exists elsewhere on the network but has not
-been registered on the local node.
+*Cause:* The catalog does not exist.
 
 *Effect:* The operation fails.
 
-*Recovery:* Enter a valid catalog name (or register the catalog on the
-node indicated) and resubmit.
+*Recovery:* Enter a valid catalog name and resubmit.
 
 [[SQL-1003]]
 == SQL 1003
@@ -55,7 +50,7 @@ Schema <schema> does not exist.
 
 Where <schema> is the ANSI name of the affected schema.
 
-*Cause:* In a replication context: a REPLICATION SCHEMA operation
+*Cause:* The statement
 specified a schema that does not exist.
 
 *Effect:* The operation fails.
@@ -100,40 +95,36 @@ the table specified. You can use the SHOWDDL command to find the names
 of the constraints that exist on a table.
 
 <<<
-[[SQL-1006]]
-== SQL 1006
+[[SQL-1007]]
+== SQL 1007
 
 ```
-Index <index-name> does not exist.
+The WITH GRANT OPTION is not supported.
 ```
 
-Where <index-name> is a {project-name} database object name.
-
-*Cause:* The operation you attempted requires the existence of an index
-named <index-name>.
+*Cause:* You attempted to GRANT privileges on a metadata table using
+the WITH GRANT OPTION. This is not allowed.
 
 *Effect:* The operation fails.
 
-*Recovery:* Check that an index named <index-name> does exist. If you
-did not fully qualify the name, check that the defaults generate the
-correct qualified name.
+*Recovery:* Remove the WITH GRANT OPTION clause and resubmit.
 
 [[SQL-1008]]
 == SQL 1008
 
 ```
-User name <user-name> does not exist.
+Authorization identifier <auth-id> does not exist.
 ```
 
-Where <user-name> is a {project-name} platform user name.
+Where <auth-id> is a {project-name} platform user name or role name.
 
-*Cause:* The user name specified in a GRANT or REVOKE statement, or the
+*Cause:* The name specified in a GRANT or REVOKE statement, or the
 authorization ID in a CREATE SCHEMA statement, does not represent a
-valid {project-name} platform user.
+valid {project-name} platform user or role.
 
 *Effect:* The operation fails.
 
-*Recovery:* Correct the user name and resubmit.
+*Recovery:* Correct the name and resubmit.
 
 <<<
 [[SQL-1009]]
@@ -157,7 +148,7 @@ column (whichever is incorrect) and resubmit.
 == SQL 1010
 
 ```
-The statement just specified is currently not supported.
+The statement just entered is currently not supported.
 ```
 
 *Cause:* The statement that you specified is not available for use.
@@ -167,6 +158,20 @@ The statement just specified is currently not supported.
 *Recovery:* Do not attempt to use this {project-name} database statement.
 
 <<<
+[[SQL-1011]]
+== SQL 1011
+
+```
+Only one grantee per grant or revoke is allowed.
+```
+
+*Cause:* The GRANT or REVOKE statement specified more than one user name or role name.
+This is currently not supported.
+
+*Effect:* The operation fails.
+
+*Recovery:* Resubmit the GRANT or REVOKE for each user name or role name individually.
+
 [[SQL-1012]]
 == SQL 1012
 
@@ -185,11 +190,13 @@ grant options.
 == SQL 1013
 
 ```
-Not all privileges were granted. You lack grant option on some of the specified privileges.
+Not all privileges were granted.  You lack grant option for the <privilege> privilege.
 ```
 
+Where <privilege> is a {project-name} privilege on some {project-name} object..
+
 *Cause:* You attempted to grant privileges, but you do not have grant
-options for at least one of them.
+options for at least the one named.
 
 *Effect:* The {project-name} database granted some privileges, but not all
 that you attempted to grant.
@@ -197,32 +204,15 @@ that you attempted to grant.
 *Recovery:* You must have grant options for privileges to grant them.
 
 <<<
-[[SQL-1014]]
-== SQL 1014
-
-```
-Privileges were not revoked. Dependent privilege descriptors still exist.
-```
-
-*Cause:* You attempted to revoke a privilege for a user who has granted
-privileges to another user. Privileges must be revoked in reverse order
-from how they were granted. If you perform a grant to another user who
-then performs a grant to a third user, you cannot revoke privileges to
-the second user until that user revokes their privileges to the third
-user.
-
-*Effect:* The {project-name} database did not revoke the privileges.
-
-*Recovery:* Make sure that the dependent privileges from the user whose
-privileges you want to revoke are revoked first.
-
 [[SQL-1015]]
 == SQL 1015
 
 ```
-Some of the specified privileges could not be revoked.
+Not all privileges were revoked. You lack the grant option for the <privilege> privilege.
 ```
 
+Where <privilege> is a {project-name} privilege on some {project-name} object..
+
 *Cause:* You attempted to revoke a privilege that does not exist or that
 was granted by another user.
 


[2/2] incubator-trafodion git commit: Merge [TRAFODION-2378] PR 858 Update Messages Guide for msgs 1002-1015

Posted by db...@apache.org.
Merge [TRAFODION-2378] PR 858 Update Messages Guide for msgs 1002-1015


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5eca45d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5eca45d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5eca45d9

Branch: refs/heads/master
Commit: 5eca45d9dc88446a3203c4f3912d81ff90988fc1
Parents: dff04c6 10b055e
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Nov 30 16:09:06 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Nov 30 16:09:06 2016 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                    |  6 +-
 core/sql/optimizer/BindItemExpr.cpp             |  3 +-
 core/sql/optimizer/BindRelExpr.cpp              |  9 +--
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |  4 +-
 .../src/asciidoc/_chapters/ddl_msgs.adoc        | 84 +++++++++-----------
 5 files changed, 46 insertions(+), 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5eca45d9/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5eca45d9/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5eca45d9/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------