fixes #273

Author: wumpz

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -148,6 +148,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_BINARY: "BINARY">  
 |   <K_BIT:"BIT">
 |   <K_BY:"BY">
+|   <K_BYTE: "BYTE">
 |   <K_CALL : "CALL">
 |   <K_CASCADE: "CASCADE">
 |   <K_CASE:"CASE">
@@ -966,7 +967,7 @@ Not all names should be allowed for aliases.
 String RelObjectNameWithoutValue() : 
 {    Token tk = null; }
 {
-    (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER>
+    (tk=<S_IDENTIFIER> | tk=<S_QUOTED_IDENTIFIER> | tk=<K_BYTE>
       | tk=<K_CAST> | tk=<K_DO> | tk=<K_EXTRACT> | tk=<K_FIRST> | tk=<K_FOLLOWING> 
       | tk=<K_LAST> | tk=<K_MATERIALIZED> | tk=<K_NULLS> | tk=<K_PARTITION> | tk=<K_RANGE> 
       | tk=<K_ROW> | tk=<K_ROWS> | tk=<K_SIBLINGS> | tk=<K_XML>
@@ -3224,7 +3225,8 @@ ColDataType ColDataType():
 		| tk=<K_UNSIGNED> tk2=<S_IDENTIFIER> {colDataType.setDataType(tk.image + " " + tk2.image);}
 	)
 
-    [LOOKAHEAD(2) "(" ( (tk=<S_LONG> | tk=<S_CHAR_LITERAL> | tk=<S_IDENTIFIER> ) { argumentsStringList.add(tk.image); } ["," {/*argumentsStringList.add(",");*/}] )*    ")"]
+    [LOOKAHEAD(2) "(" {tk2 =null;} ( (tk=<S_LONG> [ tk2=<K_BYTE> ] | tk=<S_CHAR_LITERAL> | tk=<S_IDENTIFIER> ) 
+		{ argumentsStringList.add(tk.image + (tk2!=null?" " + tk2.image:"")); } ["," {/*argumentsStringList.add(",");*/}] )*    ")"]
     [( "[" {tk=null;} [ tk=<S_LONG> ] { array.add(tk!=null?Integer.valueOf(tk.image):null); } "]" )+ { colDataType.setArrayData(array); } ]
     [<K_CHARACTER> <K_SET> tk=<S_IDENTIFIER> { colDataType.setCharacterSet(tk.image); } ]
 

src/test/java/net/sf/jsqlparser/statement/create/CreateTableTest.java

@@ -255,32 +255,36 @@ public void testCreateUnitonIssue402() throws JSQLParserException {
     public void testCreateUnitonIssue402_2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CREATE TABLE temp.abc AS (SELECT sku FROM temp.a UNION SELECT sku FROM temp.b)");
     }
-    
+
     public void testTimestampWithTimezone() throws JSQLParserException {
-        assertSqlCanBeParsedAndDeparsed("CREATE TABLE country_region (" +
-                "regionid BIGINT NOT NULL CONSTRAINT pk_auth_region PRIMARY KEY, " +
-                "region_name VARCHAR (100) NOT NULL, " +
-                "creation_date TIMESTAMP (0) WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP (0) NOT NULL, " +
-                "last_change_date TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP (0), " +
-                "CONSTRAINT region_name_unique UNIQUE (region_name))");
-    }
-    
+        assertSqlCanBeParsedAndDeparsed("CREATE TABLE country_region ("
+                + "regionid BIGINT NOT NULL CONSTRAINT pk_auth_region PRIMARY KEY, "
+                + "region_name VARCHAR (100) NOT NULL, "
+                + "creation_date TIMESTAMP (0) WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP (0) NOT NULL, "
+                + "last_change_date TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP (0), "
+                + "CONSTRAINT region_name_unique UNIQUE (region_name))");
+    }
+
     public void testCreateTableAsSelect3() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CREATE TABLE public.sales1 AS (SELECT * FROM public.sales)");
     }
-    
+
     public void testQuotedPKColumnsIssue491() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CREATE TABLE `FOO` (`ID` INT64, `NAME` STRING (100)) PRIMARY KEY (`ID`)");
     }
-    
+
     public void testQuotedPKColumnsIssue491_2() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CREATE TABLE `FOO` (`ID` INT64, `NAME` STRING (100), PRIMARY KEY (`ID`))");
     }
-    
+
     public void testKeySyntaxWithLengthColumnParameter() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CREATE TABLE basic (BASIC_TITLE varchar (255) NOT NULL, KEY BASIC_TITLE (BASIC_TITLE(255)))");
     }
 
+    public void testIssue273Varchar2Byte() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE TABLE IF NOT EXISTS \"TABLE_OK\" (\"SOME_FIELD\" VARCHAR2 (256 BYTE))");
+    }
+
     public void testRUBiSCreateList() throws Exception {
         BufferedReader in = new BufferedReader(new InputStreamReader(CreateTableTest.class.
                 getResourceAsStream("/RUBiS-create-requests.txt")));