Skip to content
Snippets Groups Projects
Commit fb4cbcfd authored by Grégory Mantelet's avatar Grégory Mantelet
Browse files

[TAP] Update the documentation about the last TAP_SCHEMA mapping improvement

(see previous commit).
parent a5406513
No related branches found
No related tags found
No related merge requests found
...@@ -169,11 +169,17 @@ ...@@ -169,11 +169,17 @@
<td></td> <td></td>
<td>text</td> <td>text</td>
<td> <td>
<p>The translator to use in order to translate ADQL to a SQL compatible with the used DBMS and its spatial extension.</p> <p>The translator to use in order to translate ADQL to a SQL compatible with the
<p>The TAP library supports only Postgresql (no spatial extension), PostgreSQL+PgSphere, SQLServer (no spatial extension) and MySQL (no spatial extension) for the moment. But you can provide your own SQL translator used DBMS and its spatial extension.</p>
(even if it does not have spatial features), by providing the name of a class (within brackets: {...}) that implements ADQLTranslator and which have at least an empty constructor.</p> <p>The TAP library supports only Postgresql (no spatial extension),
PostgreSQL+PgSphere, SQLServer (no spatial extension), MySQL (no spatial
extension) and H2 (no spatial extension) for the moment. But you can provide
your own SQL translator (even if it does not have spatial features), by
providing the name of a class (within brackets: {...}) that implements
ADQLTranslator (for instance: {apackage.MyADQLTranslator}) and which have at
least an empty constructor.</p>
</td> </td>
<td><ul><li>postgres</li><li>pgsphere</li><li>sqlserver</li><li>mysql</li><li>{apackage.MyADQLTranslator}</li></ul></td> <td><ul><li>postgres</li><li>pgsphere</li><li>sqlserver</li><li>mysql</li><li>h2</li><li>{apackage.MyADQLTranslator}</li></ul></td>
</tr> </tr>
<tr class="optional"> <tr class="optional">
<td class="done">sync_fetch_size</td> <td class="done">sync_fetch_size</td>
...@@ -321,6 +327,13 @@ ...@@ -321,6 +327,13 @@
The property value MUST be NOT qualified. Just the item name is required. The property value MUST be NOT qualified. Just the item name is required.
The value will be used as provided (with the same case). The value will be used as provided (with the same case).
</p> </p>
<p><em>
<strong>Note:</strong>
The column dbName in the database TAP_SCHEMA declaring the standard
TAP_SCHEMA entries (e.g. TAP_SCHEMA.schemas.dbName) is now ignored. Thus,
only the mapping defined here, in the configuration file, is taken into
account.
</em></p>
</td> </td>
<td> <td>
<ul> <ul>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# FULL TAP CONFIGURATION FILE # # FULL TAP CONFIGURATION FILE #
# # # #
# TAP Version: 2.3 # # TAP Version: 2.3 #
# Date: 5 Sept. 2018 # # Date: 26 Oct. 2018 #
# Author: Gregory Mantelet (CDS;ARI) # # Author: Gregory Mantelet (CDS;ARI) #
# # # #
################################################################################ ################################################################################
...@@ -79,13 +79,14 @@ database_access = ...@@ -79,13 +79,14 @@ database_access =
# used DBMS and its spatial extension. # used DBMS and its spatial extension.
# #
# The TAP library supports only Postgresql (no spatial extension), # The TAP library supports only Postgresql (no spatial extension),
# PostgreSQL+PgSphere, SQLServer (no spatial extension) and MySQL (no spatial # PostgreSQL+PgSphere, SQLServer (no spatial extension), MySQL (no spatial
# extension) for the moment. But you can provide your own SQL translator (even # extension) and H2 (no spatial extension) for the moment. But you can provide
# if it does not have spatial features), by providing the name of a class # your own SQL translator (even if it does not have spatial features), by
# (within brackets: {...}) that implements ADQLTranslator (for instance: # providing the name of a class (within brackets: {...}) that implements
# {apackage.MyADQLTranslator}) and which have at least an empty constructor. # ADQLTranslator (for instance: {apackage.MyADQLTranslator}) and which have at
# # least an empty constructor.
# Allowed values: postgres, pgsphere, sqlserver, mysql, a class name #
# Allowed values: postgres, pgsphere, sqlserver, mysql, h2, a class name
sql_translator = postgres sql_translator = postgres
# [OPTIONAL] # [OPTIONAL]
...@@ -231,6 +232,12 @@ metadata_file = ...@@ -231,6 +232,12 @@ metadata_file =
# The property value MUST be NOT qualified. Just the item name is required. # The property value MUST be NOT qualified. Just the item name is required.
# The value will be used as provided (with the same case). # The value will be used as provided (with the same case).
# #
# Note:
# The column dbName in the database TAP_SCHEMA declaring the standard
# TAP_SCHEMA entries (e.g. TAP_SCHEMA.schemas.dbName) is now ignored. Thus,
# only the mapping defined here, in the configuration file, is taken into
# account.
#
# TAP_SCHEMA = # TAP_SCHEMA =
######### #########
......
...@@ -181,7 +181,7 @@ import uws.service.log.UWSLog.LogLevel; ...@@ -181,7 +181,7 @@ import uws.service.log.UWSLog.LogLevel;
* </i></p> * </i></p>
* *
* @author Gr&eacute;gory Mantelet (CDS;ARI) * @author Gr&eacute;gory Mantelet (CDS;ARI)
* @version 2.1 (02/2018) * @version 2.3 (10/2018)
* @since 2.0 * @since 2.0
*/ */
public class JDBCConnection implements DBConnection { public class JDBCConnection implements DBConnection {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment