From 3786fadfd06a4cf278b42590b0fd377f833d53c6 Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Wed, 7 Aug 2013 01:34:22 +0000
Subject: [PATCH] 0001369: Alter generated by table upgrade that requires and
 rebuild of the table and includes the addition or removal of columns fails

---
 .../src/main/java/org/jumpmind/db/alter/PrimaryKeyChange.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/alter/PrimaryKeyChange.java b/symmetric-db/src/main/java/org/jumpmind/db/alter/PrimaryKeyChange.java
index 354033299e..b18e295199 100644
--- a/symmetric-db/src/main/java/org/jumpmind/db/alter/PrimaryKeyChange.java
+++ b/symmetric-db/src/main/java/org/jumpmind/db/alter/PrimaryKeyChange.java
@@ -80,7 +80,9 @@ public void apply(Database database, boolean caseSensitive)
         {
             Column column = table.findColumn(_oldPrimaryKeyColumns[idx].getName(), caseSensitive);
 
-            column.setPrimaryKey(false);
+            if (column != null) {
+                column.setPrimaryKey(false);
+            }
         }
         for (int idx = 0; idx < _newPrimaryKeyColumns.length; idx++)
         {