You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2020/03/22 23:00:56 UTC

[incubator-nlpcraft] branch NLPCRAFT-23 updated: CR.

This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch NLPCRAFT-23
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/NLPCRAFT-23 by this push:
     new 012f2c0  CR.
012f2c0 is described below

commit 012f2c02a91dc4f85beffc69ec9759bb6c8d93dc
Author: Aaron Radzinzski <ar...@datalingvo.com>
AuthorDate: Sun Mar 22 16:00:40 2020 -0700

    CR.
---
 .../scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.java   | 7 ++++++-
 .../org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.java     | 8 +++++---
 .../model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala         | 5 ++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.java b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.java
index 9c168c6..f792f40 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoin.java
@@ -33,6 +33,7 @@ import java.util.List;
  *     totable: "customers"
  *     tocolumns:
  *     - "customer_id"
+ *     jointype: "left"
  * </pre>
  *
  * @see NCSqlSchemaBuilder#makeSchema(NCModel)
@@ -66,6 +67,10 @@ public interface NCSqlJoin {
      */
     List<String> getToColumns();
 
-    // TODO:
+    /**
+     * Gets type of the join.
+     *
+     * @return Type of join.
+     */
     NCSqlJoinType getType();
 }
diff --git a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.java b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.java
index a725d88..7a43666 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.java
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/NCSqlJoinType.java
@@ -17,10 +17,12 @@
 
 package org.apache.nlpcraft.model.tools.sqlgen;
 
-// TODO:
-
+/**
+ * 
+ */
 public enum NCSqlJoinType {
     INNER,
     LEFT,
-    RIGHT
+    RIGHT,
+    OUTER
 }
diff --git a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
index 4954bea..2450aaa 100644
--- a/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
+++ b/src/main/scala/org/apache/nlpcraft/model/tools/sqlgen/impl/NCSqlModelGeneratorImpl.scala
@@ -576,9 +576,8 @@ object NCSqlModelGeneratorImpl {
         }
         catch {
             case _: ClassNotFoundException ⇒ errorExit(s"Unknown JDBC driver class: ${params.driver}")
-            case e: Exception ⇒
-                e.printStackTrace()
-                errorExit(s"Failed to generate model for '${params.url}': ${e.getMessage}")
+            case e: Exception ⇒ errorExit(s"Failed to generate model for '${params.url}': ${e.getMessage}")
+            case e: Exception ⇒ errorExit(s"Failed to generate model for '${params.url}': ${e.getMessage}")
         }
         
         tables.values.toSeq.filter(_.columns.nonEmpty)