Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coucou, a prendre en priorite absolue :-) #124

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

coucou, a prendre en priorite absolue :-) #124

wants to merge 12 commits into from

Conversation

gilleslandais
Copy link

@gilleslandais gilleslandais commented Oct 14, 2020

je super pool request 🥇

en gros

  • ajout des operateurs LOGIC_AND LOGIC_OR
  • modifs sur l'accessibilites de certaines methodes
  • ajout de librairie + correction de l'utilisation ParseException (??)

Conflicts:
	src/adql/db/DBChecker.java
	src/adql/parser/ADQLParser.java
	src/adql/parser/ADQLParserConstants.java
	src/adql/parser/ADQLParserTokenManager.java
	src/adql/parser/IdentifierItems.java
	src/adql/parser/adqlGrammar.jj
	src/adql/query/ADQLQuery.java
	src/adql/query/from/ADQLTable.java
	src/org/json/Json4Uws.java
	src/tap/AbstractTAPFactory.java
	src/tap/db/JDBCConnection.java
	src/uws/config/ConfigurableUWSFactory.java
	src/uws/job/UWSJob.java
	src/uws/job/serializer/XMLSerializer.java
	src/uws/service/AbstractUWSFactory.java
	src/uws/service/UWS.java
	src/uws/service/UWSServlet.java
	src/uws/service/backup/DefaultUWSBackupManager.java
	src/uws/service/request/XMLRequestParser.java
@gilleslandais gilleslandais changed the title coucou a oprendre en priorite absolue :-) coucou, a prendre en priorite absolue :-) Oct 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant