Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8DF749A87 for ; Sun, 23 Dec 2012 05:26:13 +0000 (UTC) Received: (qmail 61791 invoked by uid 500); 23 Dec 2012 05:26:13 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 61745 invoked by uid 500); 23 Dec 2012 05:26:12 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 61735 invoked by uid 99); 23 Dec 2012 05:26:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2012 05:26:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2012 05:26:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D82192388AB8; Sun, 23 Dec 2012 05:25:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1425410 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java Date: Sun, 23 Dec 2012 05:25:51 -0000 To: commits@cayenne.apache.org From: johnthuss@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121223052551.D82192388AB8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: johnthuss Date: Sun Dec 23 05:25:51 2012 New Revision: 1425410 URL: http://svn.apache.org/viewvc?rev=1425410&view=rev Log: Add 'IF NOT EXISTS' to 'CREATE TABLE AUTO_PK_SUPPORT' to support migrations The 'IF NOT EXISTS' clause is supported in MySQL all the way back to at least 3.2 (now at 5.5). Adding this will enable migrations to create tables without failing because it tries to create the AUTO_PK_SUPPORT table every time. Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java?rev=1425410&r1=1425409&r2=1425410&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java Sun Dec 23 05:25:51 2012 @@ -144,7 +144,7 @@ public class MySQLPkGenerator extends Jd @Override protected String pkTableCreateString() { StringBuilder buf = new StringBuilder(); - buf.append("CREATE TABLE AUTO_PK_SUPPORT (").append( + buf.append("CREATE TABLE IF NOT EXISTS AUTO_PK_SUPPORT (").append( " TABLE_NAME CHAR(100) NOT NULL,").append( " NEXT_ID BIGINT NOT NULL, UNIQUE (TABLE_NAME)").append(")");