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.

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

Jump to bottom

Fix to field naming and SOQL generation. #4

Merged
merged 1 commit into from
Sep 13, 2024
Merged

Fix to field naming and SOQL generation. #4

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
41 changes: 30 additions & 11 deletions src/main/scala/com/rawlabs/das/salesforce/DASSalesforceTable.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ abstract class DASSalesforceTable(
assert(op.hasNotEquals)
"<>"
}
q.getFieldName + " " + soqlOp + " " + rawValueToSOQLValue(q.getSimpleQual.getValue)
renameToSalesforce(q.getFieldName) + " " + soqlOp + " " + rawValueToSOQLValue(q.getSimpleQual.getValue)
}
.mkString(" AND ")
}
Expand All @@ -193,7 +193,7 @@ abstract class DASSalesforceTable(
.map { sk =>
val order = if (sk.getIsReversed) "DESC" else "ASC"
val nulls = if (sk.getNullsFirst) "NULLS FIRST" else "NULLS LAST"
sk.getName + " " + order + " " + nulls
renameToSalesforce(sk.getName) + " " + order + " " + nulls
}
.mkString(", ")
}
Expand Down Expand Up @@ -313,14 +313,35 @@ abstract class DASSalesforceTable(
}

private def rawValueToSOQLValue(v: Value): String = {
if (v.hasInt) v.getInt.getV.toString
else if (v.hasDouble) v.getDouble.getV.toString
else if (v.hasString) {
if (v.hasInt) {
v.getInt.getV.toString
} else if (v.hasLong) {
v.getLong.getV.toString
} else if (v.hasDouble) {
v.getDouble.getV.toString
} else if (v.hasDecimal) {
v.getDecimal.getV.toString
} else if (v.hasString) {
// Quote string safely for ', including escaping quotes
"'" + v.getString.getV.replace("'", "\\'") + "'"
} else if (v.hasBool) v.getBool.getV.toString
else if (v.hasNull) "NULL"
else if (v.hasTimestamp) {
} else if (v.hasBool) {
v.getBool.getV.toString
} else if (v.hasNull) {
"NULL"
} else if (v.hasTime) {
// Format time as ISO 8601
val hour = v.getTime.getHour
val minute = v.getTime.getMinute
val second = v.getTime.getSecond
val nano = v.getTime.getNano
f"$hour%02d:$minute%02d:$second%02d.$nano%09dZ"
} else if (v.hasDate) {
// Format date as ISO 8601
val year = v.getDate.getYear
val month = v.getDate.getMonth
val day = v.getDate.getDay
f"$year%04d-$month%02d-$day%02d"
} else if (v.hasTimestamp) {
// Format timestamp as ISO 8601
val year = v.getTimestamp.getYear
val month = v.getTimestamp.getMonth
Expand All @@ -329,9 +350,7 @@ abstract class DASSalesforceTable(
val minute = v.getTimestamp.getMinute
val second = v.getTimestamp.getSecond
val nano = v.getTimestamp.getNano
// Salesforce expects the timestamp to be in UTC
val formatted = f"'$year%04d-$month%02d-$day%02dT$hour%02d:$minute%02d:$second%02d.$nano%09dZ'"
formatted
f"$year%04d-$month%02d-$day%02dT$hour%02d:$minute%02d:$second%02d.$nano%09dZ"
} else {
throw new IllegalArgumentException(s"Unsupported value: $v")
}
Expand Down