Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C16BF200BD4 for ; Thu, 1 Dec 2016 13:58:48 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C004F160B0F; Thu, 1 Dec 2016 12:58:48 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 170BF160B0B for ; Thu, 1 Dec 2016 13:58:47 +0100 (CET) Received: (qmail 83948 invoked by uid 500); 1 Dec 2016 12:58:47 -0000 Mailing-List: contact commits-help@empire-db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: empire-db-dev@empire-db.apache.org Delivered-To: mailing list commits@empire-db.apache.org Received: (qmail 83937 invoked by uid 99); 1 Dec 2016 12:58:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2016 12:58:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 33E34E09CD; Thu, 1 Dec 2016 12:58:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: derjan@apache.org To: commits@empire-db.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: empire-db git commit: EMPIREDB-251 Date: Thu, 1 Dec 2016 12:58:47 +0000 (UTC) archived-at: Thu, 01 Dec 2016 12:58:48 -0000 Repository: empire-db Updated Branches: refs/heads/master 6e14aae47 -> 9a45804ce EMPIREDB-251 Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/9a45804c Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/9a45804c Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/9a45804c Branch: refs/heads/master Commit: 9a45804cefb27c7628451532c1514d51d622da2f Parents: 6e14aae Author: Jan Glaubitz Authored: Thu Dec 1 13:58:11 2016 +0100 Committer: Jan Glaubitz Committed: Thu Dec 1 13:58:11 2016 +0100 ---------------------------------------------------------------------- .../empire/db/mysql/MySQLDDLGenerator.java | 35 +++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/empire-db/blob/9a45804c/empire-db/src/main/java/org/apache/empire/db/mysql/MySQLDDLGenerator.java ---------------------------------------------------------------------- diff --git a/empire-db/src/main/java/org/apache/empire/db/mysql/MySQLDDLGenerator.java b/empire-db/src/main/java/org/apache/empire/db/mysql/MySQLDDLGenerator.java index 236923c..b62d877 100644 --- a/empire-db/src/main/java/org/apache/empire/db/mysql/MySQLDDLGenerator.java +++ b/empire-db/src/main/java/org/apache/empire/db/mysql/MySQLDDLGenerator.java @@ -42,6 +42,10 @@ public class MySQLDDLGenerator extends DBDDLGenerator { private static final Logger log = LoggerFactory.getLogger(MySQLDDLGenerator.class); + // Data types + protected String DATATYPE_INT_TINY = "TINYINT"; // Integer with really small size (1 byte) + protected String DATATYPE_INT_MEDIUM = "MEDIUMINT"; // Integer with really medium size (3 byte) + public MySQLDDLGenerator(DBDatabaseDriverMySQL driver) { super(driver); @@ -72,7 +76,36 @@ public class MySQLDDLGenerator extends DBDDLGenerator if (driver.isUseSequenceTable()==false) sql.append(" AUTO_INCREMENT"); break; - } + } + case INTEGER: + { + int bytes = Math.abs((int) size); + if (bytes > 0 && bytes <= 1) + { + sql.append(DATATYPE_INT_TINY); + } + else if (bytes > 0 && bytes <= 2) + { + sql.append(DATATYPE_INT_SMALL); + } + else if (bytes > 0 && bytes <= 3) + { + sql.append(DATATYPE_INT_MEDIUM); + } + else if (bytes > 0 && bytes <= 4) + { + sql.append(DATATYPE_INTEGER); + } + else if (bytes > 0 && bytes <= 8) + { + sql.append(DATATYPE_INT_BIG); + } + else + { // Default + sql.append(DATATYPE_INTEGER); // Default integer length + } + break; + } default: // use default return super.appendColumnDataType(type, size, c, sql);