Upgrade to optiq-core-0.4.12.
diff --git a/pom.xml b/pom.xml
index b4e5e2d..f075d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,8 +81,8 @@
</dependency>
<dependency>
<groupId>net.hydromatic</groupId>
- <artifactId>optiq</artifactId>
- <version>0.4.7</version>
+ <artifactId>optiq-core</artifactId>
+ <version>0.4.12</version>
</dependency>
<dependency>
<groupId>net.hydromatic</groupId>
diff --git a/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchema.java b/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchema.java
index aeb64dc..7e41b8f 100644
--- a/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchema.java
+++ b/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchema.java
@@ -40,6 +40,7 @@
* Creates a CSV schema.
*
* @param parentSchema Parent schema
+ * @param name Schema name
* @param directoryFile Directory that holds .csv files
* @param expression Java expression to create an instance of this schema
* in generated code
@@ -48,10 +49,11 @@
*/
public CsvSchema(
Schema parentSchema,
+ String name,
File directoryFile,
Expression expression,
boolean smart) {
- super(parentSchema, expression);
+ super(parentSchema, name, expression);
this.directoryFile = directoryFile;
this.smart = smart;
}
diff --git a/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchemaFactory.java b/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchemaFactory.java
index d29f190..7161c94 100644
--- a/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchemaFactory.java
+++ b/src/main/java/net/hydromatic/optiq/impl/csv/CsvSchemaFactory.java
@@ -41,6 +41,7 @@
final CsvSchema schema =
new CsvSchema(
parentSchema,
+ name,
new File(directory),
parentSchema.getSubSchemaExpression(name, CsvSchema.class),
smart != null && smart);