gvsig-mssqlserver / trunk / org.gvsig.mssqlserver / org.gvsig.mssqlserver.provider / src / test / java / org / gvsig / fmap / dal / store / jdbc2 / SQLBuilderTest.java @ 5
History | View | Annotate | Download (19.3 KB)
1 | 5 | jjdelcerro | package org.gvsig.fmap.dal.store.jdbc2; |
---|---|---|---|
2 | |||
3 | import java.util.ArrayList; |
||
4 | import java.util.List; |
||
5 | import org.apache.commons.lang3.ArrayUtils; |
||
6 | import org.cresques.cts.IProjection; |
||
7 | import org.gvsig.fmap.crs.CRSFactory; |
||
8 | import org.gvsig.fmap.dal.ExpressionBuilder; |
||
9 | import org.gvsig.fmap.dal.ExpressionBuilder.Constant; |
||
10 | import org.gvsig.fmap.dal.ExpressionBuilder.Parameter; |
||
11 | import org.gvsig.fmap.dal.ExpressionBuilder.Variable; |
||
12 | import org.gvsig.fmap.dal.SQLBuilder; |
||
13 | import org.gvsig.fmap.dal.SQLBuilder.Privilege; |
||
14 | import org.gvsig.fmap.dal.feature.spi.SQLBuilderBase; |
||
15 | import org.gvsig.fmap.geom.DataTypes; |
||
16 | import org.gvsig.fmap.geom.Geometry; |
||
17 | import org.gvsig.fmap.geom.GeometryLocator; |
||
18 | import org.gvsig.fmap.geom.GeometryManager; |
||
19 | import org.gvsig.fmap.geom.primitive.Polygon; |
||
20 | import org.gvsig.tools.junit.AbstractLibraryAutoInitTestCase; |
||
21 | |||
22 | public class SQLBuilderTest extends AbstractLibraryAutoInitTestCase { |
||
23 | |||
24 | @Override
|
||
25 | protected void doSetUp() throws Exception { |
||
26 | |||
27 | } |
||
28 | |||
29 | List<String> getVariableNames(ExpressionBuilder builder) { |
||
30 | List<String> vars = new ArrayList<>(); |
||
31 | for (Variable var : builder.getVariables()) {
|
||
32 | vars.add(var.getName()); |
||
33 | } |
||
34 | return vars;
|
||
35 | } |
||
36 | |||
37 | List<String> getParameterNames(ExpressionBuilder builder) { |
||
38 | List<String> params = new ArrayList<>(); |
||
39 | for (Parameter param : builder.getParameters()) {
|
||
40 | String s;
|
||
41 | switch(param.getType()) {
|
||
42 | case Constant:
|
||
43 | Object value = param.getValue();
|
||
44 | if( value==null ) { |
||
45 | s = "null";
|
||
46 | } else if( value instanceof String ) { |
||
47 | s = "'" + (String)value + "'"; |
||
48 | } else {
|
||
49 | s = value.toString(); |
||
50 | } |
||
51 | break;
|
||
52 | case Geometry:
|
||
53 | case Variable:
|
||
54 | default:
|
||
55 | s = "\"" + param.getName() + "\""; |
||
56 | } |
||
57 | params.add(s); |
||
58 | } |
||
59 | return params;
|
||
60 | } |
||
61 | |||
62 | |||
63 | public void testCalulateEnvelope() throws Exception { |
||
64 | GeometryManager geometryManager = GeometryLocator.getGeometryManager(); |
||
65 | IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
||
66 | |||
67 | Polygon limit = geometryManager.createPolygon(Geometry.SUBTYPES.GEOM2D);
|
||
68 | limit.addVertex(0, 0); |
||
69 | limit.addVertex(0, 100); |
||
70 | limit.addVertex(100, 100); |
||
71 | limit.addVertex(100, 0); |
||
72 | limit.addVertex(0, 0); |
||
73 | |||
74 | SQLBuilder builder = new SQLBuilderBase();
|
||
75 | |||
76 | builder.select().column().value( |
||
77 | builder.getAsGeometry( |
||
78 | builder.ST_ExtentAggregate( |
||
79 | builder.column("the_geom")
|
||
80 | ) |
||
81 | ) |
||
82 | ).as("envelope");
|
||
83 | builder.select().from().table().database("master").schema("dbo").name("test1"); |
||
84 | builder.select().where().set( |
||
85 | builder.ST_Intersects( |
||
86 | builder.ST_Envelope( |
||
87 | builder.column("the_geom")
|
||
88 | ), |
||
89 | builder.geometry(limit, proj) |
||
90 | ) |
||
91 | ); |
||
92 | builder.select().where().and( |
||
93 | builder.custom("x = 27")
|
||
94 | ); |
||
95 | |||
96 | // SELECT ST_AsBinary(ST_Extent("the_geom")) AS "envelope" FROM "master"."dbo"."test1" WHERE ST_Intersects((ST_Envelope("the_geom")), (ST_GeomFromText('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))', (4326)))) AND x = 27
|
||
97 | |||
98 | System.out.println("# Test:: testCalulateEnvelope"); |
||
99 | System.out.println("# SQL:: " + builder.toString()); |
||
100 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
101 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
102 | assertEquals( |
||
103 | "SELECT ST_AsBinary(ST_Extent(\"the_geom\")) AS \"envelope\" FROM \"master\".\"dbo\".\"test1\" WHERE ST_Intersects((ST_Envelope(\"the_geom\")), (ST_GeomFromText('POLYGON ((0 0, 0 100, 100 100, 100 0, 0 0))', (4326)))) AND x = 27",
|
||
104 | builder.toString() |
||
105 | ); |
||
106 | assertEquals( |
||
107 | "[the_geom]",
|
||
108 | ArrayUtils.toString(getVariableNames(builder)) |
||
109 | ); |
||
110 | assertEquals( |
||
111 | "[]",
|
||
112 | ArrayUtils.toString(getParameterNames(builder)) |
||
113 | ); |
||
114 | } |
||
115 | |||
116 | public void testCount() throws Exception { |
||
117 | SQLBuilder builder = new SQLBuilderBase();
|
||
118 | |||
119 | builder.select().column().value(builder.count().all()); |
||
120 | builder.select().from().table().database("master").schema("dbo").name("test1"); |
||
121 | builder.select().from().subquery(null);
|
||
122 | builder.select().where().set( builder.custom("pp = 200"));
|
||
123 | |||
124 | System.out.println("# Test:: testCount"); |
||
125 | System.out.println("# SQL:: " + builder.toString()); |
||
126 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
127 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
128 | |||
129 | //# Test:: testCount
|
||
130 | //# SQL:: SELECT COUNT(*) FROM "master"."dbo"."test1" WHERE pp = 200
|
||
131 | //# Variables:: []
|
||
132 | //# Parametros:: []
|
||
133 | |||
134 | assertEquals( |
||
135 | "SELECT COUNT(*) FROM \"master\".\"dbo\".\"test1\" WHERE pp = 200",
|
||
136 | builder.toString() |
||
137 | ); |
||
138 | assertEquals( |
||
139 | "[]",
|
||
140 | ArrayUtils.toString(getVariableNames(builder)) |
||
141 | ); |
||
142 | assertEquals( |
||
143 | "[]",
|
||
144 | ArrayUtils.toString(getParameterNames(builder)) |
||
145 | ); |
||
146 | } |
||
147 | |||
148 | public void testCreateTable() throws Exception { |
||
149 | SQLBuilder builder = new SQLBuilderBase();
|
||
150 | |||
151 | builder.create_table().table().database("master").schema("dbo").name("test1"); |
||
152 | builder.create_table().add_column( |
||
153 | "name",
|
||
154 | DataTypes.STRING, |
||
155 | 45,
|
||
156 | 0,
|
||
157 | false,
|
||
158 | true,
|
||
159 | false,
|
||
160 | null
|
||
161 | ); |
||
162 | builder.create_table().add_column( |
||
163 | "id",
|
||
164 | DataTypes.INT, |
||
165 | 0,
|
||
166 | 0,
|
||
167 | true,
|
||
168 | false,
|
||
169 | true,
|
||
170 | 0
|
||
171 | ); |
||
172 | builder.create_table().add_column( |
||
173 | "geom",
|
||
174 | DataTypes.GEOMETRY, |
||
175 | 0,
|
||
176 | 0,
|
||
177 | false,
|
||
178 | true,
|
||
179 | false,
|
||
180 | null
|
||
181 | ); |
||
182 | |||
183 | |||
184 | // CREATE TABLE "master"."dbo"."test1" ("name" VARCHAR(45) DEFAULT NULL NULL, "id" SERIAL DEFAULT '0' NOT NULL PRIMARY KEY, "geom" TEXT DEFAULT NULL NULL )
|
||
185 | System.out.println("# Test:: testCreateTable"); |
||
186 | System.out.println("# SQL:: " + builder.toString()); |
||
187 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
188 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
189 | assertEquals( |
||
190 | "CREATE TABLE \"master\".\"dbo\".\"test1\" (\"name\" VARCHAR(45) DEFAULT NULL NULL, \"id\" SERIAL DEFAULT '0' NOT NULL PRIMARY KEY, \"geom\" TEXT DEFAULT NULL NULL )",
|
||
191 | builder.toString() |
||
192 | ); |
||
193 | assertEquals( |
||
194 | "[]",
|
||
195 | ArrayUtils.toString(getVariableNames(builder)) |
||
196 | ); |
||
197 | assertEquals( |
||
198 | "[]",
|
||
199 | ArrayUtils.toString(getParameterNames(builder)) |
||
200 | ); |
||
201 | } |
||
202 | |||
203 | public void testDropTable() throws Exception { |
||
204 | SQLBuilder builder = new SQLBuilderBase();
|
||
205 | |||
206 | builder.drop_table().table().database("master").schema("dbo").name("test1"); |
||
207 | |||
208 | // DROP TABLE "master"."dbo"."test1"; DELETE FROM GEOMETRY_COLUMNS WHERE f_table_schema = 'dbo' AND f_table_name = 'test1'
|
||
209 | |||
210 | System.out.println("# Test:: testDropTable"); |
||
211 | System.out.println("# SQL:: " + builder.toString()); |
||
212 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
213 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
214 | assertEquals( |
||
215 | "DROP TABLE \"master\".\"dbo\".\"test1\"; DELETE FROM GEOMETRY_COLUMNS WHERE f_table_schema = 'dbo' AND f_table_name = 'test1'",
|
||
216 | builder.toString() |
||
217 | ); |
||
218 | assertEquals( |
||
219 | "[]",
|
||
220 | ArrayUtils.toString(getVariableNames(builder)) |
||
221 | ); |
||
222 | assertEquals( |
||
223 | "[]",
|
||
224 | ArrayUtils.toString(getParameterNames(builder)) |
||
225 | ); |
||
226 | } |
||
227 | |||
228 | public void testFetchFeatureProviderByReference() throws Exception { |
||
229 | SQLBuilder builder = new SQLBuilderBase();
|
||
230 | |||
231 | String value = "yoyo"; |
||
232 | builder.select().column().name("name");
|
||
233 | builder.select().column().name("id");
|
||
234 | builder.select().column().name("geom").as_geometry();
|
||
235 | builder.select().from().table().database("master").schema("dbo").name("test1"); |
||
236 | builder.select().where().set( |
||
237 | builder.eq( |
||
238 | builder.column("name"),
|
||
239 | builder.parameter(value).as_constant() |
||
240 | ) |
||
241 | ); |
||
242 | builder.select().limit(1);
|
||
243 | |||
244 | // SELECT "name", "id", ST_AsBinary("geom") FROM "master"."dbo"."test1" WHERE ( ("name") = (?) ) LIMIT 1
|
||
245 | |||
246 | System.out.println("# Test:: testFetchFeatureProviderByReference"); |
||
247 | System.out.println("# SQL:: " + builder.toString()); |
||
248 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
249 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
250 | assertEquals( |
||
251 | "SELECT \"name\", \"id\", ST_AsBinary(\"geom\") FROM \"master\".\"dbo\".\"test1\" WHERE ( (\"name\") = (?) ) LIMIT 1",
|
||
252 | builder.toString() |
||
253 | ); |
||
254 | assertEquals( |
||
255 | "[geom, id, name]",
|
||
256 | ArrayUtils.toString(getVariableNames(builder)) |
||
257 | ); |
||
258 | assertEquals( |
||
259 | "['yoyo']",
|
||
260 | ArrayUtils.toString(getParameterNames(builder)) |
||
261 | ); |
||
262 | } |
||
263 | |||
264 | public void testFetchFeatureType() throws Exception { |
||
265 | SQLBuilder builder = new SQLBuilderBase();
|
||
266 | |||
267 | builder.select().column().all(); |
||
268 | builder.select().from().table().database("master").schema("dbo").name("test1"); |
||
269 | builder.select().limit(1);
|
||
270 | |||
271 | System.out.println("# Test:: testFetchFeatureType"); |
||
272 | System.out.println("# SQL:: " + builder.toString()); |
||
273 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
274 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
275 | |||
276 | //# Test:: testFetchFeatureType
|
||
277 | //# SQL:: SELECT * FROM [master].[dbo].[test1] LIMMIT 1
|
||
278 | //# Variables:: []
|
||
279 | //# Parametros:: []
|
||
280 | |||
281 | assertEquals( |
||
282 | "SELECT * FROM \"master\".\"dbo\".\"test1\" LIMIT 1",
|
||
283 | builder.toString() |
||
284 | ); |
||
285 | assertEquals( |
||
286 | "[]",
|
||
287 | ArrayUtils.toString(getVariableNames(builder)) |
||
288 | ); |
||
289 | assertEquals( |
||
290 | "[]",
|
||
291 | ArrayUtils.toString(getParameterNames(builder)) |
||
292 | ); |
||
293 | } |
||
294 | |||
295 | public void testPerformDeletes() throws Exception { |
||
296 | SQLBuilder builder = new SQLBuilderBase();
|
||
297 | |||
298 | builder.delete().table().database("master").schema("dbo").name("test1"); |
||
299 | builder.delete().where().and( |
||
300 | builder.eq( |
||
301 | builder.column("id1"),
|
||
302 | builder.parameter("id1").as_variable()
|
||
303 | ) |
||
304 | ); |
||
305 | builder.delete().where().and( |
||
306 | builder.eq( |
||
307 | builder.column("id2"),
|
||
308 | builder.parameter("id2").as_variable()
|
||
309 | ) |
||
310 | ); |
||
311 | |||
312 | // DELETE FROM "master"."dbo"."test1" WHERE ( ("id1") = (?) ) AND ( ("id2") = (?) )
|
||
313 | |||
314 | System.out.println("# Test:: testPerformDeletes"); |
||
315 | System.out.println("# SQL:: " + builder.toString()); |
||
316 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
317 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
318 | assertEquals( |
||
319 | "DELETE FROM \"master\".\"dbo\".\"test1\" WHERE ( (\"id1\") = (?) ) AND ( (\"id2\") = (?) )",
|
||
320 | builder.toString() |
||
321 | ); |
||
322 | assertEquals( |
||
323 | "[id1, id2]",
|
||
324 | ArrayUtils.toString(getVariableNames(builder)) |
||
325 | ); |
||
326 | assertEquals( |
||
327 | "[\"id1\", \"id2\"]",
|
||
328 | ArrayUtils.toString(getParameterNames(builder)) |
||
329 | ); |
||
330 | } |
||
331 | |||
332 | public void testPerformInserts1() throws Exception { |
||
333 | IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
||
334 | |||
335 | SQLBuilder builder = new SQLBuilderBase();
|
||
336 | |||
337 | builder.insert().table().database("master").schema("dbo").name("test1"); |
||
338 | builder.insert().column().name("id").with_value(builder.parameter("id")); |
||
339 | builder.insert().column().name("name").with_value(builder.parameter("name")); |
||
340 | builder.insert().column().name("geom").with_value(builder.parameter("geom").as_geometry().srs(proj)); |
||
341 | |||
342 | // INSERT INTO "master"."dbo"."test1" ( "id", "name", "geom" ) VALUES ( ?, ?, ST_GeomFromText(?, (4326)) )
|
||
343 | |||
344 | System.out.println("# Test:: testPerformInserts1"); |
||
345 | System.out.println("# SQL:: " + builder.toString()); |
||
346 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
347 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
348 | assertEquals( |
||
349 | "INSERT INTO \"master\".\"dbo\".\"test1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, ST_GeomFromText(?, (4326)) )",
|
||
350 | builder.toString() |
||
351 | ); |
||
352 | assertEquals( |
||
353 | "[geom, id, name]",
|
||
354 | ArrayUtils.toString(getVariableNames(builder)) |
||
355 | ); |
||
356 | assertEquals( |
||
357 | "[\"id\", \"name\", \"geom\"]",
|
||
358 | ArrayUtils.toString(getParameterNames(builder)) |
||
359 | ); |
||
360 | } |
||
361 | |||
362 | public void testPerformInserts2() throws Exception { |
||
363 | IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
||
364 | |||
365 | SQLBuilder builder = new SQLBuilderBase();
|
||
366 | |||
367 | builder.insert().table().database("master").schema("dbo").name("test1"); |
||
368 | builder.insert().column().name("id").with_value(builder.parameter("id")); |
||
369 | builder.insert().column().name("name").with_value(builder.parameter("name")); |
||
370 | builder.insert().column().name("geom").with_value(builder.parameter("geom").as_geometry().srs(builder.parameter(proj))); |
||
371 | |||
372 | // INSERT INTO "master"."dbo"."test1" ( "id", "name", "geom" ) VALUES ( ?, ?, ST_GeomFromText(?, (?)) )
|
||
373 | |||
374 | System.out.println("# Test:: testPerformInserts2"); |
||
375 | System.out.println("# SQL:: " + builder.toString()); |
||
376 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
377 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
378 | assertEquals( |
||
379 | "INSERT INTO \"master\".\"dbo\".\"test1\" ( \"id\", \"name\", \"geom\" ) VALUES ( ?, ?, ST_GeomFromText(?, (?)) )",
|
||
380 | builder.toString() |
||
381 | ); |
||
382 | assertEquals( |
||
383 | "[geom, id, name]",
|
||
384 | ArrayUtils.toString(getVariableNames(builder)) |
||
385 | ); |
||
386 | assertEquals( |
||
387 | "[\"id\", \"name\", \"geom\", 4326]",
|
||
388 | ArrayUtils.toString(getParameterNames(builder)) |
||
389 | ); |
||
390 | } |
||
391 | |||
392 | public void testPerformUpdates() throws Exception { |
||
393 | IProjection proj = CRSFactory.getCRS("EPSG:4326");
|
||
394 | |||
395 | SQLBuilder builder = new SQLBuilderBase();
|
||
396 | |||
397 | builder.update().table().database("master").schema("dbo").name("test1"); |
||
398 | builder.update().where().and( |
||
399 | builder.eq( |
||
400 | builder.column("id"),
|
||
401 | builder.parameter("id").as_variable()
|
||
402 | ) |
||
403 | ); |
||
404 | builder.update().column().name("name").with_value(builder.parameter("name")); |
||
405 | builder.update().column().name("geom").with_value(
|
||
406 | builder.parameter("geom").as_geometry().srs( builder.parameter(proj))
|
||
407 | ); |
||
408 | |||
409 | // UPDATE "master"."dbo"."test1" SET "name" = ?, "geom" = ST_GeomFromText(?, (?)) WHERE ( ("id") = (?) )
|
||
410 | |||
411 | System.out.println("# Test:: testPerformUpdates"); |
||
412 | System.out.println("# SQL:: " + builder.toString()); |
||
413 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
414 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
415 | assertEquals( |
||
416 | "UPDATE \"master\".\"dbo\".\"test1\" SET \"name\" = ?, \"geom\" = ST_GeomFromText(?, (?)) WHERE ( (\"id\") = (?) )",
|
||
417 | builder.toString() |
||
418 | ); |
||
419 | assertEquals( |
||
420 | "[geom, id, name]",
|
||
421 | ArrayUtils.toString(getVariableNames(builder)) |
||
422 | ); |
||
423 | assertEquals( |
||
424 | "[\"name\", \"geom\", 4326, \"id\"]",
|
||
425 | ArrayUtils.toString(getParameterNames(builder)) |
||
426 | ); |
||
427 | } |
||
428 | |||
429 | public void testGrant1() throws Exception { |
||
430 | |||
431 | SQLBuilder builder = new SQLBuilderBase();
|
||
432 | |||
433 | builder.grant().table().database("master").schema("dbo").name("test1"); |
||
434 | builder.grant().role("prueba").select().insert().update();
|
||
435 | builder.grant().role("gis").all();
|
||
436 | |||
437 | |||
438 | System.out.println("# Test:: testGrant1"); |
||
439 | System.out.println("# SQL:: " + builder.toString()); |
||
440 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
441 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
442 | assertEquals( |
||
443 | "",
|
||
444 | builder.toString() |
||
445 | ); |
||
446 | assertEquals( |
||
447 | "[]",
|
||
448 | ArrayUtils.toString(getVariableNames(builder)) |
||
449 | ); |
||
450 | assertEquals( |
||
451 | "[]",
|
||
452 | ArrayUtils.toString(getParameterNames(builder)) |
||
453 | ); |
||
454 | } |
||
455 | |||
456 | public void testGrant2() throws Exception { |
||
457 | |||
458 | SQLBuilder builder = new SQLBuilderBase();
|
||
459 | |||
460 | builder.grant().table().database("master").schema("dbo").name("test1"); |
||
461 | builder.grant().role("prueba").privilege(Privilege.SELECT)
|
||
462 | .privilege(Privilege.INSERT) |
||
463 | .privilege(Privilege.UPDATE); |
||
464 | builder.grant().role("gis").privilege(Privilege.ALL);
|
||
465 | |||
466 | |||
467 | System.out.println("# Test:: testGrant2"); |
||
468 | System.out.println("# SQL:: " + builder.toString()); |
||
469 | System.out.println("# Variables:: " + ArrayUtils.toString(getVariableNames(builder))); |
||
470 | System.out.println("# Parametros:: " + ArrayUtils.toString(getParameterNames(builder))); |
||
471 | assertEquals( |
||
472 | "",
|
||
473 | builder.toString() |
||
474 | ); |
||
475 | assertEquals( |
||
476 | "[]",
|
||
477 | ArrayUtils.toString(getVariableNames(builder)) |
||
478 | ); |
||
479 | assertEquals( |
||
480 | "[]",
|
||
481 | ArrayUtils.toString(getParameterNames(builder)) |
||
482 | ); |
||
483 | } |
||
484 | |||
485 | |||
486 | } |