unlogged inlucded in deparser

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java

@@ -36,7 +36,7 @@
 public class CreateTable implements Statement {
 
     private Table table;
-    private Boolean unlogged;
+    private boolean unlogged = false;
     private List<String> tableOptionsStrings;
     private List<ColumnDefinition> columnDefinitions;
     private List<Index> indexes;
@@ -60,10 +60,11 @@ public void setTable(Table table) {
 
     /**
      * Whether the table is unlogged or not (PostgreSQL 9.1+ feature)
+     * @return 
      */
-    public Boolean isUnlogged() { return unlogged; }
+    public boolean isUnlogged() { return unlogged; }
 
-    public void setUnlogged(Boolean unlogged) { this.unlogged = unlogged; }
+    public void setUnlogged(boolean unlogged) { this.unlogged = unlogged; }
 
     /**
      * A list of {@link ColumnDefinition}s of this table.
@@ -113,7 +114,7 @@ public void setSelect(Select select) {
     public String toString() {
         String sql = "";
 
-        sql = "CREATE " + (unlogged != null && unlogged ? "UNLOGGED " : "") + "TABLE " + table;
+        sql = "CREATE " + (unlogged ? "UNLOGGED " : "") + "TABLE " + table;
 
         if (select != null) {
             sql += " AS " + select.toString();

src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java

@@ -43,7 +43,11 @@ public CreateTableDeParser(StringBuilder buffer) {
     }
 
     public void deParse(CreateTable createTable) {
-        buffer.append("CREATE TABLE ").append(createTable.getTable().getFullyQualifiedName());
+        buffer.append("CREATE ");
+        if (createTable.isUnlogged()) {
+            buffer.append("UNLOGGED ");
+        }
+        buffer.append("TABLE ").append(createTable.getTable().getFullyQualifiedName());
         if (createTable.getSelect() != null) {
             buffer.append(" AS ").append(createTable.getSelect().toString());
         } else {

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

@@ -47,6 +47,19 @@ public void testCreateTableAsSelect2() throws JSQLParserException {
 	}
 
 	public void testCreateTable() throws JSQLParserException {
+		String statement = "CREATE TABLE mytab (mycol a (10, 20) c nm g, mycol2 mypar1 mypar2 (23,323,3) asdf ('23','123') dasd, "
+				+ "PRIMARY KEY (mycol2, mycol)) type = myisam";
+		CreateTable createTable = (CreateTable) parserManager.parse(new StringReader(statement));
+		assertEquals(2, createTable.getColumnDefinitions().size());
+        assertFalse(createTable.isUnlogged());
+		assertEquals("mycol", ((ColumnDefinition) createTable.getColumnDefinitions().get(0)).getColumnName());
+		assertEquals("mycol2", ((ColumnDefinition) createTable.getColumnDefinitions().get(1)).getColumnName());
+		assertEquals("PRIMARY KEY", ((Index) createTable.getIndexes().get(0)).getType());
+		assertEquals("mycol", ((Index) createTable.getIndexes().get(0)).getColumnsNames().get(1));
+		assertEquals(statement, "" + createTable);
+	}
+    
+    public void testCreateTableUnlogged() throws JSQLParserException {
 		String statement = "CREATE UNLOGGED TABLE mytab (mycol a (10, 20) c nm g, mycol2 mypar1 mypar2 (23,323,3) asdf ('23','123') dasd, "
 				+ "PRIMARY KEY (mycol2, mycol)) type = myisam";
 		CreateTable createTable = (CreateTable) parserManager.parse(new StringReader(statement));
@@ -58,6 +71,11 @@ public void testCreateTable() throws JSQLParserException {
 		assertEquals("mycol", ((Index) createTable.getIndexes().get(0)).getColumnsNames().get(1));
 		assertEquals(statement, "" + createTable);
 	}
+    
+    public void testCreateTableUnlogged2() throws JSQLParserException {
+		String statement = "CREATE UNLOGGED TABLE mytab (mycol a (10, 20) c nm g, mycol2 mypar1 mypar2 (23,323,3) asdf ('23','123') dasd, PRIMARY KEY (mycol2, mycol))";
+		assertSqlCanBeParsedAndDeparsed(statement);
+	}
 
 	public void testCreateTableForeignKey() throws JSQLParserException {
 		String statement = "CREATE TABLE test (id INT UNSIGNED NOT NULL AUTO_INCREMENT, string VARCHAR (20), user_id INT UNSIGNED, PRIMARY KEY (id), FOREIGN KEY (user_id) REFERENCES ra_user(id))";