You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2014/05/31 17:23:05 UTC
git commit: METAMODEL-58: Fixed
Repository: incubator-metamodel
Updated Branches:
refs/heads/master 979ac7835 -> f1ca2be89
METAMODEL-58: Fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/f1ca2be8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/f1ca2be8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/f1ca2be8
Branch: refs/heads/master
Commit: f1ca2be89aeb0fff790f9fa7de28c7ca579be032
Parents: 979ac78
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat May 31 14:30:30 2014 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat May 31 14:30:30 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 12 ++++++-----
.../metamodel/create/AbstractColumnBuilder.java | 1 +
.../create/AbstractCreateTableBuilderTest.java | 22 ++++++++------------
3 files changed, 17 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f1ca2be8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b69e4d2..e9e8606 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,9 @@
Apache MetaModel 4.1.0-incubating
* [METAMODEL-13] - Added support for Apache HBase via the new module "MetaModel-hbase"
- * [METAMODEL-54] - ColumnType converted from enum to interface to allow for further specialization in modules
+ * [METAMODEL-54] - ColumnType converted from enum to interface to allow for further specialization in modules.
* [METAMODEL-56] - Made separate column types for converted JDBC LOBs - "CLOB as String" and "BLOB as bytes".
- * [METAMODEL-41] - Added a parser for SimpleTableDef objects (SimpleTableDefParser). It parses statements similar to CREATE TABLE statements, although without the "CREATE TABLE" prefix. For example: foo (bar INTEGER, baz VARCHAR)
+ * [METAMODEL-41] - Added a parser for SimpleTableDef objects (SimpleTableDefParser). It parses statements similar to CREATE TABLE statements, although without the "CREATE TABLE" prefix. For example: foo (bar INTEGER, baz VARCHAR).
* [METAMODEL-11] - New module "MetaModel-spring" which adds a convenient FactoryBean to produce various types of DataContext objects based on externalizable parameters, for Spring framework users.
* [METAMODEL-32] - Fixed thread-safety issue in Excel module when tables (sheets) metadata is updated.
* [METAMODEL-47] - Fixed issue in Excel of loading schema if query is fired based on metadata from a previous DataContext instance.
@@ -11,12 +11,14 @@ Apache MetaModel 4.1.0-incubating
* [METAMODEL-44] - Added an optional method for QueryPostprocessDataContext implementations to do a row-lookup by primary key value.
* [METAMODEL-43] - Made CSV datastores skip empty lines in file instead of treating them of rows with null values.
* [METAMODEL-39] - Added pooling of active/used Connections and PreparedStatements in JDBC compiled queries.
+ * [METAMODEL-58] - Fixed a bug related to using CreateTable class and primary keys not getting created.
* [METAMODEL-34] - Updated LICENSE file to not include bundled dependencies' licenses.
* [METAMODEL-33] - Ensured that Apache Rat plugin for Maven is properly activated.
* [METAMODEL-37] - Removed old site sources from project.
- * [METAMODEL-3] - Improved writing of Byte-Order-Mark (BOM) for various encoding spelling variants
- * [METAMODEL-59] - Fixed a bug related to handling of date/time literals in MS SQL Server queries
- * [METAMODEL-60] - Fixed a bug related to DISTINCT and TOP keywords in MS SQL Server queries
+ * [METAMODEL-3] - Improved writing of Byte-Order-Mark (BOM) for various encoding spelling variants.
+ * [METAMODEL-59] - Fixed a bug related to handling of date/time literals in MS SQL Server queries.
+ * [METAMODEL-60] - Fixed a bug related to DISTINCT and TOP keywords in MS SQL Server queries.
+ * [METAMODEL-45] - Improved and standardized way of handling integration test connection information towards external databases.
Apache MetaModel 4.0.0-incubating
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f1ca2be8/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java b/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java
index 408eecd..3fd045b 100644
--- a/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java
+++ b/core/src/main/java/org/apache/metamodel/create/AbstractColumnBuilder.java
@@ -51,6 +51,7 @@ abstract class AbstractColumnBuilder<T extends ColumnBuilder<?>> implements Colu
_column.setNativeType(column.getNativeType());
_column.setType(column.getType());
_column.setNullable(column.isNullable());
+ _column.setPrimaryKey(column.isPrimaryKey());
return getReturnObject();
}
http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/f1ca2be8/core/src/test/java/org/apache/metamodel/create/AbstractCreateTableBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/metamodel/create/AbstractCreateTableBuilderTest.java b/core/src/test/java/org/apache/metamodel/create/AbstractCreateTableBuilderTest.java
index 40815ce..1884a41 100644
--- a/core/src/test/java/org/apache/metamodel/create/AbstractCreateTableBuilderTest.java
+++ b/core/src/test/java/org/apache/metamodel/create/AbstractCreateTableBuilderTest.java
@@ -56,14 +56,11 @@ public class AbstractCreateTableBuilderTest extends TestCase {
assertEquals("tablename", table.getName());
assertEquals(3, table.getColumnCount());
- assertEquals(
- "Column[name=foo,columnNumber=0,type=VARCHAR,nullable=true,nativeType=vch,columnSize=1234]",
+ assertEquals("Column[name=foo,columnNumber=0,type=VARCHAR,nullable=true,nativeType=vch,columnSize=1234]",
table.getColumns()[0].toString());
- assertEquals(
- "Column[name=bar,columnNumber=1,type=null,nullable=null,nativeType=null,columnSize=null]",
+ assertEquals("Column[name=bar,columnNumber=1,type=null,nullable=null,nativeType=null,columnSize=null]",
table.getColumns()[1].toString());
- assertEquals(
- "Column[name=baz,columnNumber=2,type=null,nullable=false,nativeType=null,columnSize=null]",
+ assertEquals("Column[name=baz,columnNumber=2,type=null,nullable=false,nativeType=null,columnSize=null]",
table.getColumns()[2].toString());
assertEquals("CREATE TABLE schema.tablename (foo VARCHAR(1234) PRIMARY KEY,bar,baz NOT NULL)", builder.toSql());
@@ -86,7 +83,7 @@ public class AbstractCreateTableBuilderTest extends TestCase {
MutableTable likeTable = new MutableTable("blablablabla");
likeTable.addColumn(new MutableColumn("foo", ColumnType.VARCHAR, likeTable, 0, 1234, "vch", true, null, false,
- null));
+ null).setPrimaryKey(true));
likeTable.addColumn(new MutableColumn("bar"));
likeTable.addColumn(new MutableColumn("baz"));
@@ -97,14 +94,13 @@ public class AbstractCreateTableBuilderTest extends TestCase {
assertEquals("tablename", table.getName());
assertEquals(3, table.getColumnCount());
- assertEquals(
- "Column[name=foo,columnNumber=0,type=VARCHAR,nullable=true,nativeType=vch,columnSize=1234]",
+ assertEquals("Column[name=foo,columnNumber=0,type=VARCHAR,nullable=true,nativeType=vch,columnSize=1234]",
table.getColumns()[0].toString());
- assertEquals(
- "Column[name=bar,columnNumber=1,type=null,nullable=null,nativeType=null,columnSize=null]",
+ assertTrue(table.getColumns()[0].isPrimaryKey());
+
+ assertEquals("Column[name=bar,columnNumber=1,type=null,nullable=null,nativeType=null,columnSize=null]",
table.getColumns()[1].toString());
- assertEquals(
- "Column[name=baz,columnNumber=2,type=null,nullable=null,nativeType=null,columnSize=null]",
+ assertEquals("Column[name=baz,columnNumber=2,type=null,nullable=null,nativeType=null,columnSize=null]",
table.getColumns()[2].toString());
}
}