aaa

.gitignore

@@ -15,4 +15,5 @@
 *.iml
 
 *.jj~
-*.*~
+*.java~
+*.yml~

.travis.yml

@@ -0,0 +1,8 @@
+language: java
+jdk:
+  - openjdk7
+  - oraclejdk7
+  - oraclejdk8
+
+after_success:
+  - mvn clean cobertura:cobertura coveralls:report

README.md

@@ -1,232 +1,71 @@
 # JSqlParser
 
-## News
+[![Build Status](https://travis-ci.org/JSQLParser/JSqlParser.svg?branch=master)](https://travis-ci.org/JSQLParser/JSqlParser)   [![Coverage Status](https://coveralls.io/repos/JSQLParser/JSqlParser/badge.svg?branch=master)](https://coveralls.io/r/JSQLParser/JSqlParser?branch=master)
 
-Version **0.8.9** released.
+[![PayPal donate button](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=64CCN9JJANZXA "Help this JSqlParser version using Paypal")  
 
-Version **0.8.8** released.
+[![Gitter](https://badges.gitter.im/JSQLParser/JSqlParser.svg)](https://gitter.im/JSQLParser/JSqlParser?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-Due to incompatibilities using maven release with git v1.8.5 I skipped version 0.8.7. So the actual released version is **0.8.8**.
+Look here for more information and examples: https://github.com/JSQLParser/JSqlParser/wiki.
 
-Recent changes in **0.8.7-SNAPSHOT** for some alias support changes introducing some API changes.
+## License
 
-Version **0.8.6** released.
+JSqlParser is dual licensed under **LGPL V2.1** and **Apache Software License, Version 2.0**.
 
 
-The first release version **0.8.5** is available at maven central (**http://repo1.maven.org/maven2/**) and at repository 
-**https://oss.sonatype.org/content/groups/public/**.
+## News
 
+* Version **0.9.5** released.
+* Please test the actual **0.9.5-SNAPSHOT**. It includes some grammar refactorings which eventually results in parse tree changes.
+* Version **0.9.4** released.
+* Please test the actual SNAPSHOT, if there are problems using the extended identifier token.
+* Version **0.9.3** released.
 
-The maven repository settings have been changed. Version **0.8.5-SNAPSHOT** will be the
-first snapshot at sonatypes open source repository location. The following releases will
-go there as well and published to maven central. To avoid problems with the original 
-projects artifacts the *groupid* was changed to **com.github.jsqlparser**. You will find
-configuration details below.
+More news can be found here: https://github.com/JSQLParser/JSqlParser/wiki/News.
 
 ## JSqlParser
 
-JSqlParser parses an SQL statement and translate it into a hierarchy of Java classes. 
-The generated hierarchy can be navigated using the Visitor Pattern.
+JSqlParser is a SQL statement parser. It translates SQLs in a traversable hierarchy of Java classes. JSqlParser is not limited to one database but provides support for a lot of specials of Oracle, SqlServer, MySQL, PostgreSQL ... To name some, it has support for Oracles join syntax using (+), PostgreSQLs cast syntax using ::, relational operators like != and so on.
 
-## Extensions Version 0.9
+## Support
+If you need help using JSqlParser feel free to file an issue or contact me.
 
-* Character Set support included.
+## Contributions
+To help JSqlParsers development you are encouraged to provide 
+* feedback
+* bugreports
+* pull requests for new features
+* improvement requests
+* fund new features
 
-```sql
-CAST(col2 AS CHAR(255) CHARACTER SET utf8)
-```
+Also I would like to know about needed examples or documentation stuff.
 
-## Extensions Version 0.8.9
+## Extensions in the latest SNAPSHOT version 0.9.6
 
-* First multi statements or script support.
-* Backported window option from fork to analytic expression.
-* Added **NULLS FIRST** and **NULLS LAST** to order by.
-* Improved parsing of **top**.
-* Improved support for multi part names (SQLServer) 
-* Better support for signed expressions. The sign is stored in the parse tree.
-
-```sql
-SELECT +col, -col FROM mytable
-```
-
-* Added **CCJSqlParserUtil.parseExpression** to parse a simple expression. Now you can build expressions from a String like "a+b".
+* support for **SELECT UNIQUE**
+* first support for date literals like **TIMESTAMP'2004-04-30 04:05:34.56'**
+* support for **UPDATE RETURNING**
+* support for scalar time function, like **CURRENT_TIMESTAMP**
+* support for **LEFT SEMI JOIN**
+* improved **top** expression
 
 ```java
-Expression expr = CCJSqlParserUtil.parseExpression("a*(5+mycolumn)");
-```
-
-* Improved **SelectUtils** to build simple select statements.
-
-```java
-Select select = SelectUtils.buildSelectFromTable(new Table("mytable"));
-```
-
-## Extensions Version 0.8.8
-
-* Startet a simple utility class **SelectUtils** to collect basic **select** modification tools.
-    * addExpression adds a new expression to the select list.
-    * addJoin adds a new join to the select.
-* Added support for optional " AS " for aliases. 
-
-```sql
-SELECT * FROM mytable myalias
-```
-
-* Added first support for ALTER TABLE statements
-
-```sql
-ALTER TABLE mytable ADD COLUMN mycolumn varchar (255)
+SELECT TOP (? + 1) * FROM MyTable
 ```
 
-* Added support for PostgreSQL regular expression match operators.
+* allowed negative interval expressions like **INTERVAL -420 MINUTES**.
+* support for **ALTER VIEW** statements
+* improved merge statement
+* support for non standard syntax *>  =*, *<  =* and *<  >* (with whitespaces between)
 
-```sql
-SELECT a, b FROM foo WHERE a ~ '[help].*';
-SELECT a, b FROM foo WHERE a ~* '[help].*';
-SELECT a, b FROM foo WHERE a !~ '[help].*';
-SELECT a, b FROM foo WHERE a !~* '[help].*';
-```
-
-## Extensions Version 0.8.6
+## Extensions of JSqlParser releases
 
-* Added first support for Oracle hierarchical queries
+* [Release Notes](https://github.com/JSQLParser/JSqlParser/releases)
+* Modifications before GitHubs release tagging are listed in the [Older Releases](https://github.com/JSQLParser/JSqlParser/wiki/Older-Releases) page.
 
-```sql
-SELECT * FROM employees CONNECT BY employee_id = manager_id ORDER BY last_name;
-SELECT * FROM employees START WITH employee_id = 100 CONNECT BY PRIOR employee_id = manager_id ORDER SIBLINGS BY last_name;
-```
 
-## Extensions Version 0.8.5
 
-* Added support for mysql truncate function
-* Changed repository location and groupid of JSqlParsers artifact.
-
-```xml
-<dependency>
-	<groupId>com.github.jsqlparser</groupId>
-	<artifactId>jsqlparser</artifactId>
-	<version>0.8.5</version>
-</dependency>
-```
-
-* Added support for postgresql type **character varying**.
-
-## Extensions Version 0.8.4
-
-* Added support for named JDBC parameters
-
-```sql
-SELECT * FROM mytable WHERE b = :param
-```
-* Added support for pivot expressions 
-* Added support for boolean functions in where statements
-
-```sql
-select * from my_table where bool_func(col)
-```
-* Added support for Oracles old join syntax for more compare operations
-
-```sql
-select * from taba, tabb where taba.a<tabb.a(+)
-```
-* Added support for foreign keys in create table statements
-
-```sql
-create table testTable1 (a varchar(10), b varchar(20), foreign key a references testTable2(a))
-create table testTable1 (a varchar(10), b varchar(20), constraint fkIdx foreign key a references testTable2(a))
-```
-* Added support for simple intervals
-
-```sql
-select 5 - INTERVAL '45 MINUTE' from mytable
-```
-* Added support for multi values IN expression
-
-```sql
-select * from mytable where (a,b,c) in (select a,b,c from mytable2)
-```
-
-## Extensions Version 0.8.3
-
-* Added support for cross join 
-* Allowed complex expressions in extract from
-* Corrected cast expression to make type parameters usable (e.g. cast(col1 as varchar(255))
-* Added support for column comma list in partition by statements
-* Added support for columns names in create view statements
-
-```sql
-create view testView (col1,col2) as select a, b from table
-```
-* Added support for column cast using ::
-* Added support for from clause in update statements
-
-```sql
-update tab1 set c=5 from tab1 inner join tab2 on tab1.col1=tab2.col2
-``` 
-* Corrected TableNamesFinder to work with update statements additions.
-* Added support for simple create materialized view statements without additional parameters.
-
-```sql
-create materialized view testView as select a, b from table
-```
-* Added support for simple create index statements
-
-```sql
-create index myindex on mytab (mycol, mycol2)
-```
-
-## Extensions til Version 0.8.2
-
-* Changed project tests to junit 4
-* Changed project layout to maven project
-* Added regexp (REGEXP) operator
-* Added support for SELECT without FROM  (e.g. "SELECT 1+2")
-* Moved parser from using StringBuffer to using StringBuilder
-* Added support for CAST expression
-
-```sql
-select cast(col as varchar) from table
-```
-* Added support for modulo (a % b)
-* Added support for brackets quotation
-* Added support for NOT expr IS (expr IS NOT was already supported)
-* Added support for Oracles (+) Join Syntax
-
-```sql
-select * from taba, tabb where taba.a=tabb.a(+)
-```
-* Added alias visitor to add aliases to selections
-* Added connect visitor
-* TableNamesFinder moved from tests to main source
-* Added proper support for sets (union, intersect)
-
-```sql
-select a from taba union select b from tabb
-select a from taba intersect select b from tabb
-select a from taba except select b from tabb
-select a from taba minus select b from tabb
-```
-* Added support for `extract(year from datetime-expr)`
-* Start implementation of analytical expressions
-* merged support for CREATE VIEW 
-* Added lateral subquery support
-* Added support for multi values insert statement
-
-```sql
-insert taba (col1,col2) values (1,2), (2,5), (3,20)
-```
-* Added support for multi values in select statement
-
-```sql
-SELECT col FROM (VALUES 1,2) AS MY_TABLE(col)
-```
-* Added extended support for analytic expressions (empty over clause, parameter within aggregat function)
-
-```sql
-SELECT sum(a) over () FROM taba
-```
-
-## BUILDING
+## BUILDING from the sources
 
 As the project is a Maven project, building is rather simple by running:
 
@@ -258,15 +97,7 @@ And this is the dependency declaration in your pom:
 <dependency>
 	<groupId>com.github.jsqlparser</groupId>
 	<artifactId>jsqlparser</artifactId>
-	<version>0.8.6</version>
+	<version>0.9.5</version>
 </dependency>
 ```
 
-## Original project
-
-This is a fork of the jsqlparser originally developed by ultimoamore.
-
-Original project websites:
-
-* http://jsqlparser.sourceforge.net
-* http://sourceforge.net/projects/jsqlparser/

nb-configuration.xml

@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-shared-configuration>
-    <!--
-	This file contains additional configuration written by modules in the NetBeans IDE.
-	The configuration is intended to be shared among all the users of project and
-	therefore it is assumed to be part of version control checkout.
-	Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-	-->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-		Properties that influence various parts of the IDE, especially code formatting and the like. 
-		You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-		That way multiple projects can share the same settings (useful for formatting rules for example).
-		Any value defined here will override the pom.xml file value but is only applicable to the current project.
-		-->
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
-        <netbeans.hint.jdkPlatform>JDK_1.7</netbeans.hint.jdkPlatform>
-    </properties>
-</project-shared-configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+    <!--
+	This file contains additional configuration written by modules in the NetBeans IDE.
+	The configuration is intended to be shared among all the users of project and
+	therefore it is assumed to be part of version control checkout.
+	Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+	-->
+    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+        <!--
+		Properties that influence various parts of the IDE, especially code formatting and the like. 
+		You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+		That way multiple projects can share the same settings (useful for formatting rules for example).
+		Any value defined here will override the pom.xml file value but is only applicable to the current project.
+		-->
+        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+    </properties>
+</project-shared-configuration>

nbactions.xml

@@ -12,4 +12,12 @@
                 <skipTests>true</skipTests>
             </properties>
         </action>
+        <action>
+            <actionName>CUSTOM-clean deploy</actionName>
+            <displayName>clean deploy</displayName>
+            <goals>
+                <goal>clean</goal>
+                <goal>deploy</goal>
+            </goals>
+        </action>
     </actions>