diff --git hplsql/src/main/java/org/apache/hive/hplsql/Conf.java hplsql/src/main/java/org/apache/hive/hplsql/Conf.java index c78dda4..1a3af1e 100644 --- hplsql/src/main/java/org/apache/hive/hplsql/Conf.java +++ hplsql/src/main/java/org/apache/hive/hplsql/Conf.java @@ -152,7 +152,7 @@ boolean getConnectionConvert(String name) { if (convert != null) { return convert.booleanValue(); } - return false; + return true; } /** diff --git hplsql/src/main/java/org/apache/hive/hplsql/Exec.java hplsql/src/main/java/org/apache/hive/hplsql/Exec.java index 2ad3ea3..485c4e9 100644 --- hplsql/src/main/java/org/apache/hive/hplsql/Exec.java +++ hplsql/src/main/java/org/apache/hive/hplsql/Exec.java @@ -2395,7 +2395,8 @@ String evalPop(HplsqlParser.DtypeContext type, HplsqlParser.Dtype_lenContext len if (isConvert(exec.conf.defaultConnection)) { return exec.converter.dataType(type, len); } - return getText(type, type.getStart(), len.getStop()); + ParserRuleContext stopCtx = (len != null) ? len : type; + return getText(type, type.getStart(), stopCtx.getStop()); } /** diff --git hplsql/src/main/resources/hplsql-site.xml hplsql/src/main/resources/hplsql-site.xml index 96843dc..24caaad 100644 --- hplsql/src/main/resources/hplsql-site.xml +++ hplsql/src/main/resources/hplsql-site.xml @@ -12,8 +12,6 @@ hplsql.conn.init.hiveconn - set hive.execution.engine=mr; - use default; Statements for execute after connection to the database @@ -35,8 +33,6 @@ hplsql.conn.init.hive2conn - set hive.execution.engine=mr; - use default; Statements for execute after connection to the database diff --git hplsql/src/test/java/org/apache/hive/hplsql/TestHplsqlOffline.java hplsql/src/test/java/org/apache/hive/hplsql/TestHplsqlOffline.java index 313511d..9e010c4 100644 --- hplsql/src/test/java/org/apache/hive/hplsql/TestHplsqlOffline.java +++ hplsql/src/test/java/org/apache/hive/hplsql/TestHplsqlOffline.java @@ -62,7 +62,12 @@ public void testCreateTableOra() throws Exception { public void testCreateTableOra2() throws Exception { run("create_table_ora2"); } - + + @Test + public void testCreateTableOra3() throws Exception { + run("create_table_ora3"); + } + @Test public void testCreateTablePg() throws Exception { run("create_table_pg"); diff --git hplsql/src/test/queries/offline/create_table_ora3.sql hplsql/src/test/queries/offline/create_table_ora3.sql new file mode 100644 index 0000000..69e6c2a --- /dev/null +++ hplsql/src/test/queries/offline/create_table_ora3.sql @@ -0,0 +1,6 @@ +CREATE TABLE dept ( +deptno NUMBER(2,0), +dname NUMBER(14), +loc VARCHAR2(13), +CONSTRAINT pk_dept PRIMARY KEY (deptno) +); \ No newline at end of file diff --git hplsql/src/test/results/offline/create_table_ora3.out.txt hplsql/src/test/results/offline/create_table_ora3.out.txt new file mode 100644 index 0000000..63b2bed --- /dev/null +++ hplsql/src/test/results/offline/create_table_ora3.out.txt @@ -0,0 +1,6 @@ +Ln:1 CREATE TABLE +Ln:1 CREATE TABLE dept ( +deptno DECIMAL(2,0), +dname DECIMAL(14), +loc STRING +) \ No newline at end of file