Skip to content

Quote table name in addition to columns. #24

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.

Sign up for GitHub

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

Open
serac wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Quote table name in addition to columns. #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...abasetable/src/main/java/org/identityconnectors/databasetable/DatabaseTableConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public Uid create(ObjectClass oclass, Set<Attribute> attrs, OperationOptions opt
final String accountName = name.getNameValue();
log.ok("Required Name attribure value {0} for create", accountName);

final String tblname = config.getTable();
final String tblname = quoteName(config.getTable());
// start the insert statement
final InsertIntoBuilder bld = new InsertIntoBuilder();

Expand Down Expand Up @@ -313,7 +313,7 @@ public void delete(final ObjectClass oclass, final Uid uid, final OperationOptio
final String accountUid = uid.getUidValue();
log.ok("The Uid is present");

final String tblname = config.getTable();
final String tblname = quoteName(config.getTable());
final String keycol = quoteName(config.getKeyColumn());
final String sql = MessageFormat.format(SQL_DELETE, tblname, keycol);
try {
Expand Down Expand Up @@ -419,7 +419,7 @@ public Uid update(ObjectClass oclass, Uid uid, Set<Attribute> attrs, OperationOp
log.info("Update account {0}", accountName);

// Format the update query
final String tblname = config.getTable();
final String tblname = quoteName(config.getTable());
final String keycol = quoteName(config.getKeyColumn());
SQLColumnTypeInfo columnTypeInfo = getColumnTypeInfo(config.getKeyColumn());
updateSet.addValue(new SQLParam(keycol, accountUid, columnTypeInfo.getTypeCode(), columnTypeInfo.getTypeName()));
Expand Down Expand Up @@ -493,7 +493,7 @@ public void executeQuery(ObjectClass oclass, FilterWhereBuilder where, ResultsHa
final Set<String> columnNamesToGet = resolveColumnNamesToGet(options);
log.ok("Column Names {0} To Get", columnNamesToGet);
// For all account query there is no need to replace or quote anything
final DatabaseQueryBuilder query = new DatabaseQueryBuilder(tblname, columnNamesToGet);
final DatabaseQueryBuilder query = new DatabaseQueryBuilder(quoteName(tblname), columnNamesToGet);
query.setWhere(where);

ResultSet result = null;
Expand Down Expand Up @@ -550,7 +550,7 @@ public void sync(ObjectClass oclass, SyncToken token, SyncResultsHandler handler
log.ok("The change log column is ok");

// Names
final String tblname = config.getTable();
final String tblname = quoteName(config.getTable());
final String changeLogColumnName = quoteName(config.getChangeLogColumn());
log.ok("Change log attribute {0} map to column name {1}", config.getChangeLogColumn(), changeLogColumnName);
final Set<String> columnNames = resolveColumnNamesToGet(options);
Expand Down Expand Up @@ -640,8 +640,8 @@ public SyncToken getLatestSyncToken(ObjectClass oclass) {

// Format the update query
final String tblname = config.getTable();
final String chlogName = quoteName(config.getChangeLogColumn());
final String sql = MessageFormat.format(SQL_SELECT, chlogName, tblname);
final String chlogName = config.getChangeLogColumn();
final String sql = MessageFormat.format(SQL_SELECT, quoteName(chlogName), quoteName(tblname));
SyncToken ret = null;

log.info("getLatestSyncToken on {0}", oclass);
Expand Down Expand Up @@ -999,7 +999,7 @@ private Set<AttributeInfo> buildSelectBasedAttributeInfos() {

log.info("get schema from the table");
Set<AttributeInfo> attrInfo;
String sql = MessageFormat.format(schemaQuery, config.getTable(), quoteName(config.getKeyColumn()));
String sql = MessageFormat.format(schemaQuery, quoteName(config.getTable()), quoteName(config.getKeyColumn()));
// check out the result etc..
ResultSet rset = null;
Statement stmt = null;
Expand Down