[Firebird-checkins] SF.net SVN: firebird:[62340] firebird/trunk

[<ale...@us...>]

Revision: 62340
          http://sourceforge.net/p/firebird/code/62340
Author:   alexpeshkoff
Date:     2015-10-09 13:57:39 +0000 (Fri, 09 Oct 2015)
Log Message:
-----------
Better syntax for CORE-4955 & docs

Modified Paths:
--------------
    firebird/trunk/doc/sql.extensions/README.ddl.txt
    firebird/trunk/src/dsql/parse.y

Modified: firebird/trunk/doc/sql.extensions/README.ddl.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.ddl.txt	2015-10-09 13:30:45 UTC (rev 62339)
+++ firebird/trunk/doc/sql.extensions/README.ddl.txt	2015-10-09 13:57:39 UTC (rev 62340)
@@ -475,3 +475,14 @@
 missed ROLE clause before 3.0.
 
 ISQL now also takes into an account global role setting when creating databases.
+
+
+19) Added {PRESERVE | DELETE} FILE clause to DROP SHADOW statement.
+(Alex Peshkov)
+
+In some cases it's desired to keep shadow file after dropping shadow (for example for
+backup purporse). In FB3 appropriate clause is added to DROP SHADOW. Full syntax is:
+
+DROP SHADOW number [{PRESERVE | DELETE} FILE];
+
+Default behavior is to delete file keeping backwards compatibility.

Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y	2015-10-09 13:30:45 UTC (rev 62339)
+++ firebird/trunk/src/dsql/parse.y	2015-10-09 13:57:39 UTC (rev 62340)
@@ -4074,8 +4074,8 @@
 %type <boolVal> opt_no_file_delete
 opt_no_file_delete
 	: /* nothing */			{ $$ = false; }
-	| NO KW_FILE KW_DELETE	{ $$ = true; }
-	| NO KW_DELETE KW_FILE	{ $$ = true; }
+	| PRESERVE KW_FILE		{ $$ = true; }
+	| KW_DELETE KW_FILE		{ $$ = false; }
 	;
 
 // these are the allowable datatypes

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.