Skip to content

Commit efbb316

Browse files
fupelaqufupelaqu
committed
rename columName to name and alias to tableAlias, add field alias
1 parent 1dc7eb4 commit efbb316

File tree

9 files changed

+136
-113
lines changed

9 files changed

+136
-113
lines changed

‎es6/sql-bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ case class ElasticAggregation(
4343
object ElasticAggregation {
4444
def apply(sqlAgg: SQLField, filter: Option[SQLCriteria]): ElasticAggregation = {
4545
import sqlAgg._
46-
val sourceField = identifier.columnName
46+
val sourceField = identifier.name
4747

48-
val field = alias match {
48+
val field = fieldAlias match {
4949
case Some(alias) => alias.alias
5050
case _ => sourceField
5151
}

‎es6/sql-bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/package.scala‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -76,44 +76,44 @@ package object bridge {
7676
case _: Ge.type =>
7777
maybeNot match {
7878
case Some(_) =>
79-
rangeQuery(identifier.columnName) lt n.sql
79+
rangeQuery(identifier.name) lt n.sql
8080
case _ =>
81-
rangeQuery(identifier.columnName) gte n.sql
81+
rangeQuery(identifier.name) gte n.sql
8282
}
8383
case _: Gt.type =>
8484
maybeNot match {
8585
case Some(_) =>
86-
rangeQuery(identifier.columnName) lte n.sql
86+
rangeQuery(identifier.name) lte n.sql
8787
case _ =>
88-
rangeQuery(identifier.columnName) gt n.sql
88+
rangeQuery(identifier.name) gt n.sql
8989
}
9090
case _: Le.type =>
9191
maybeNot match {
9292
case Some(_) =>
93-
rangeQuery(identifier.columnName) gt n.sql
93+
rangeQuery(identifier.name) gt n.sql
9494
case _ =>
95-
rangeQuery(identifier.columnName) lte n.sql
95+
rangeQuery(identifier.name) lte n.sql
9696
}
9797
case _: Lt.type =>
9898
maybeNot match {
9999
case Some(_) =>
100-
rangeQuery(identifier.columnName) gte n.sql
100+
rangeQuery(identifier.name) gte n.sql
101101
case _ =>
102-
rangeQuery(identifier.columnName) lt n.sql
102+
rangeQuery(identifier.name) lt n.sql
103103
}
104104
case _: Eq.type =>
105105
maybeNot match {
106106
case Some(_) =>
107-
not(termQuery(identifier.columnName, n.sql))
107+
not(termQuery(identifier.name, n.sql))
108108
case _ =>
109-
termQuery(identifier.columnName, n.sql)
109+
termQuery(identifier.name, n.sql)
110110
}
111111
case _: Ne.type =>
112112
maybeNot match {
113113
case Some(_) =>
114-
termQuery(identifier.columnName, n.sql)
114+
termQuery(identifier.name, n.sql)
115115
case _ =>
116-
not(termQuery(identifier.columnName, n.sql))
116+
not(termQuery(identifier.name, n.sql))
117117
}
118118
case _ => matchAllQuery()
119119
}
@@ -122,51 +122,51 @@ package object bridge {
122122
case _: Like.type =>
123123
maybeNot match {
124124
case Some(_) =>
125-
not(regexQuery(identifier.columnName, toRegex(l.value)))
125+
not(regexQuery(identifier.name, toRegex(l.value)))
126126
case _ =>
127-
regexQuery(identifier.columnName, toRegex(l.value))
127+
regexQuery(identifier.name, toRegex(l.value))
128128
}
129129
case _: Ge.type =>
130130
maybeNot match {
131131
case Some(_) =>
132-
rangeQuery(identifier.columnName) lt l.value
132+
rangeQuery(identifier.name) lt l.value
133133
case _ =>
134-
rangeQuery(identifier.columnName) gte l.value
134+
rangeQuery(identifier.name) gte l.value
135135
}
136136
case _: Gt.type =>
137137
maybeNot match {
138138
case Some(_) =>
139-
rangeQuery(identifier.columnName) lte l.value
139+
rangeQuery(identifier.name) lte l.value
140140
case _ =>
141-
rangeQuery(identifier.columnName) gt l.value
141+
rangeQuery(identifier.name) gt l.value
142142
}
143143
case _: Le.type =>
144144
maybeNot match {
145145
case Some(_) =>
146-
rangeQuery(identifier.columnName) gt l.value
146+
rangeQuery(identifier.name) gt l.value
147147
case _ =>
148-
rangeQuery(identifier.columnName) lte l.value
148+
rangeQuery(identifier.name) lte l.value
149149
}
150150
case _: Lt.type =>
151151
maybeNot match {
152152
case Some(_) =>
153-
rangeQuery(identifier.columnName) gte l.value
153+
rangeQuery(identifier.name) gte l.value
154154
case _ =>
155-
rangeQuery(identifier.columnName) lt l.value
155+
rangeQuery(identifier.name) lt l.value
156156
}
157157
case _: Eq.type =>
158158
maybeNot match {
159159
case Some(_) =>
160-
not(termQuery(identifier.columnName, l.value))
160+
not(termQuery(identifier.name, l.value))
161161
case _ =>
162-
termQuery(identifier.columnName, l.value)
162+
termQuery(identifier.name, l.value)
163163
}
164164
case _: Ne.type =>
165165
maybeNot match {
166166
case Some(_) =>
167-
termQuery(identifier.columnName, l.value)
167+
termQuery(identifier.name, l.value)
168168
case _ =>
169-
not(termQuery(identifier.columnName, l.value))
169+
not(termQuery(identifier.name, l.value))
170170
}
171171
case _ => matchAllQuery()
172172
}
@@ -175,16 +175,16 @@ package object bridge {
175175
case _: Eq.type =>
176176
maybeNot match {
177177
case Some(_) =>
178-
not(termQuery(identifier.columnName, b.value))
178+
not(termQuery(identifier.name, b.value))
179179
case _ =>
180-
termQuery(identifier.columnName, b.value)
180+
termQuery(identifier.name, b.value)
181181
}
182182
case _: Ne.type =>
183183
maybeNot match {
184184
case Some(_) =>
185-
termQuery(identifier.columnName, b.value)
185+
termQuery(identifier.name, b.value)
186186
case _ =>
187-
not(termQuery(identifier.columnName, b.value))
187+
not(termQuery(identifier.name, b.value))
188188
}
189189
case _ => matchAllQuery()
190190
}
@@ -196,14 +196,14 @@ package object bridge {
196196
isNull: SQLIsNull
197197
): Query = {
198198
import isNull._
199-
not(existsQuery(identifier.columnName))
199+
not(existsQuery(identifier.name))
200200
}
201201

202202
implicit def isNotNullToQuery(
203203
isNotNull: SQLIsNotNull
204204
): Query = {
205205
import isNotNull._
206-
existsQuery(identifier.columnName)
206+
existsQuery(identifier.name)
207207
}
208208

209209
implicit def inToQuery[R, T <: SQLValue[R]](in: SQLIn[R, T]): Query = {
@@ -212,12 +212,12 @@ package object bridge {
212212
val t =
213213
_values.headOption match {
214214
case Some(_: Double) =>
215-
termsQuery(identifier.columnName, _values.asInstanceOf[Seq[Double]])
215+
termsQuery(identifier.name, _values.asInstanceOf[Seq[Double]])
216216
case Some(_: Integer) =>
217-
termsQuery(identifier.columnName, _values.asInstanceOf[Seq[Integer]])
217+
termsQuery(identifier.name, _values.asInstanceOf[Seq[Integer]])
218218
case Some(_: Long) =>
219-
termsQuery(identifier.columnName, _values.asInstanceOf[Seq[Long]])
220-
case _ => termsQuery(identifier.columnName, _values.map(_.toString))
219+
termsQuery(identifier.name, _values.asInstanceOf[Seq[Long]])
220+
case _ => termsQuery(identifier.name, _values.map(_.toString))
221221
}
222222
maybeNot match {
223223
case Some(_) => not(t)
@@ -229,7 +229,7 @@ package object bridge {
229229
between: SQLBetween
230230
): Query = {
231231
import between._
232-
val r = rangeQuery(identifier.columnName) gte from.value lte to.value
232+
val r = rangeQuery(identifier.name) gte from.value lte to.value
233233
maybeNot match {
234234
case Some(_) => not(r)
235235
case _ => r
@@ -240,14 +240,14 @@ package object bridge {
240240
geoDistance: ElasticGeoDistance
241241
): Query = {
242242
import geoDistance._
243-
geoDistanceQuery(identifier.columnName, lat.value, lon.value) distance distance.value
243+
geoDistanceQuery(identifier.name, lat.value, lon.value) distance distance.value
244244
}
245245

246246
implicit def matchToQuery(
247247
matchExpression: ElasticMatch
248248
): Query = {
249249
import matchExpression._
250-
matchQuery(identifier.columnName, value.value)
250+
matchQuery(identifier.name, value.value)
251251
}
252252

253253
implicit def criteriaToElasticCriteria(

‎sql/bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ case class ElasticAggregation(
4444
object ElasticAggregation {
4545
def apply(sqlAgg: SQLField, filter: Option[SQLCriteria]): ElasticAggregation = {
4646
import sqlAgg._
47-
val sourceField = identifier.columnName
47+
val sourceField = identifier.name
4848

49-
val field = alias match {
49+
val field = fieldAlias match {
5050
case Some(alias) => alias.alias
5151
case _ => sourceField
5252
}

0 commit comments

Comments
 (0)