Merge lp:~tjoneslo/akiban-server/fix-bug-1167541 into lp:~akiban-technologies/akiban-server/trunk

[Thomas Jones-Low]

Fix bug 1167451 - Have the SequenceDDL process check if the sequence in question is begin used as a identity column for a table and reject the drop with an error message.

[Thomas Jones-Low (tjoneslo)]

Now with fewer merge conflicts.

review: Needs Resubmitting

[Nathan Williams (nwilliams)]

Would you be opposed to moving the usage check into BasicDDLFunctions? That way other consumers get in on the action and other things (transaction, locking) come along for free.

review: Needs Fixing

[Thomas Jones-Low (tjoneslo)]

Not at all, moved check as requested.

review: Needs Resubmitting

[Thomas Jones-Low (tjoneslo)]

One thing I thought about doing, but didn't to keep this simple, was to have the Sequence contain a link back to the UserTable if the Sequence was being used as a identity column for the table. Makes the check simpler at the expense of maintaining an extra field in the Sequence.

[Nathan Williams (nwilliams)]

Thanks for the tweak. Looks good to me.

review: Approve

=== added file 'src/main/java/com/akiban/server/error/DropSequenceNotAllowedException.java'
--- src/main/java/com/akiban/server/error/DropSequenceNotAllowedException.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/server/error/DropSequenceNotAllowedException.java	2013-04-17 22:41:30 +0000
@@ -0,0 +1,26 @@
+/**
+ * Copyright (C) 2009-2013 Akiban Technologies, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.akiban.server.error;
+
+import com.akiban.ais.model.TableName;
+
+public class DropSequenceNotAllowedException extends InvalidOperationException {
+
+    public DropSequenceNotAllowedException(String sequenceName, TableName table) {
+        super(ErrorCode.DROP_SEQUENCE_NOT_ALLOWED, sequenceName, table.getSchemaName(), table.getTableName());
+    }
+}
 
=== modified file 'src/main/java/com/akiban/server/error/ErrorCode.java'
--- src/main/java/com/akiban/server/error/ErrorCode.java	2013-04-15 16:02:52 +0000
+++ src/main/java/com/akiban/server/error/ErrorCode.java	2013-04-17 22:41:30 +0000
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+ 
 package com.akiban.server.error;
 
 import org.slf4j.Logger;
@@ -375,6 +375,7 @@
     MODEL_BUILDER_ERROR     ("50", "026", Importance.DEBUG, ModelBuilderException.class),
     COLUMN_NOT_GENERATED    ("50", "027", Importance.DEBUG, ColumnNotGeneratedException.class),
     COLUMN_ALREADY_GENERATED ("50", "028", Importance.DEBUG, ColumnAlreadyGeneratedException.class),
+    DROP_SEQUENCE_NOT_ALLOWED ("50", "029", Importance.DEBUG, DropSequenceNotAllowedException.class),
 
     // Class 51 - Internal problems created by user configuration
     STALE_AIS               ("51", "001", Importance.TRACE, OldAISException.class),
 
=== modified file 'src/main/java/com/akiban/server/service/dxl/BasicDDLFunctions.java'
--- src/main/java/com/akiban/server/service/dxl/BasicDDLFunctions.java	2013-04-15 19:20:36 +0000
+++ src/main/java/com/akiban/server/service/dxl/BasicDDLFunctions.java	2013-04-17 22:41:30 +0000
@@ -83,6 +83,7 @@
 import com.akiban.server.api.dml.scan.Cursor;
 import com.akiban.server.api.dml.scan.CursorId;
 import com.akiban.server.api.dml.scan.ScanRequest;
+import com.akiban.server.error.DropSequenceNotAllowedException;
 import com.akiban.server.error.ForeignConstraintDDLException;
 import com.akiban.server.error.InvalidOperationException;
 import com.akiban.server.error.NoSuchGroupException;
@@ -1300,7 +1301,12 @@
         if (sequence == null) {
             throw new NoSuchSequenceException (sequenceName);
         }
-        
+
+        for (UserTable table : getAIS(session).getUserTables().values()) {
+            if (table.getIdentityColumn() != null && table.getIdentityColumn().getIdentityGenerator().equals(sequence)) {
+                throw new DropSequenceNotAllowedException(sequence.getSequenceName().getTableName(), table.getName());
+            }
+        }
         store().deleteSequences(session, Collections.singleton(sequence));
         schemaManager().dropSequence(session, sequence);
     }
 
=== modified file 'src/main/java/com/akiban/sql/aisddl/SequenceDDL.java'
--- src/main/java/com/akiban/sql/aisddl/SequenceDDL.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/sql/aisddl/SequenceDDL.java	2013-04-17 22:41:30 +0000
@@ -19,7 +19,9 @@
 import com.akiban.ais.model.AISBuilder;
 import com.akiban.ais.model.Sequence;
 import com.akiban.ais.model.TableName;
+import com.akiban.ais.model.UserTable;
 import com.akiban.server.api.DDLFunctions;
+import com.akiban.server.error.DropSequenceNotAllowedException;
 import com.akiban.server.error.NoSuchSequenceException;
 import com.akiban.server.service.session.Session;
 import com.akiban.sql.parser.CreateSequenceNode;
 
=== modified file 'src/main/resources/com/akiban/server/error/error_code.properties'
--- src/main/resources/com/akiban/server/error/error_code.properties	2013-04-15 16:02:52 +0000
+++ src/main/resources/com/akiban/server/error/error_code.properties	2013-04-17 22:41:30 +0000
@@ -251,6 +251,7 @@
 MODEL_BUILDER_ERROR     = Error building model for `{0}`.`{1}`: {2}
 COLUMN_NOT_GENERATED     = Column `{0}`.`{1}`.`{2}` is not generated
 COLUMN_ALREADY_GENERATED = Column `{0}`.`{1}`.`{2}` already generated by sequence `{3}`.`{4}`
+DROP_SEQUENCE_NOT_ALLOWED = Sequence `{0}` is in use by table `{1}`.`{2}` and can not be dropped
 #
 # Class 51 - Internal problems created by user configuration
 #
 
=== added file 'src/test/resources/com/akiban/sql/pg/yaml/bugs/test-bug-1167451.yaml'
--- src/test/resources/com/akiban/sql/pg/yaml/bugs/test-bug-1167451.yaml	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/pg/yaml/bugs/test-bug-1167451.yaml	2013-04-17 22:41:30 +0000
@@ -0,0 +1,14 @@
+---
+- Properties: sys-mysql
+- suppressed: true
+---
+- CreateTable: t_sequence (c1 integer not null generated by default as identity)
+---
+- Statement: insert into t_sequence (c1) values (null)
+---
+- Statement: select * from t_sequence
+- output: [[1]]
+---
+- Statement: drop sequence `test`.`_sequence-122892222` restrict
+- error: [50029]
+...
 \ No newline at end of file