Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e7a7bec

Browse files
committed
Switch to VARCHAR2 for Oracle tests.
VARCHAR should not be used with Oracle. Original pull request #2065 See #2064 
1 parent c00158a commit e7a7bec

File tree

5 files changed

+61
-61
lines changed

5 files changed

+61
-61
lines changed

‎spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.core/JdbcAggregateTemplateIntegrationTests-oracle.sql‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ DROP TABLE BEFORE_CONVERT_CALLBACK_FOR_SAVE_BATCH CASCADE CONSTRAINTS PURGE;
5454
CREATE TABLE LEGO_SET
5555
(
5656
"id1" NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
57-
NAME VARCHAR(30)
57+
NAME VARCHAR2(30)
5858
);
5959
CREATE TABLE MANUAL
6060
(
6161
"id2" NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
6262
LEGO_SET NUMBER,
6363
"alternative" NUMBER,
64-
CONTENT VARCHAR(2000)
64+
CONTENT VARCHAR2(2000)
6565
);
6666

6767
ALTER TABLE MANUAL
@@ -71,27 +71,27 @@ ALTER TABLE MANUAL
7171
CREATE TABLE ONE_TO_ONE_PARENT
7272
(
7373
"id3" NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
74-
content VARCHAR(30)
74+
content VARCHAR2(30)
7575
);
7676
CREATE TABLE Child_No_Id
7777
(
7878
ONE_TO_ONE_PARENT INTEGER PRIMARY KEY,
79-
CONTENT VARCHAR(30)
79+
CONTENT VARCHAR2(30)
8080
);
8181

8282
CREATE TABLE LIST_PARENT
8383
(
8484
"id4" NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
85-
NAME VARCHAR(100)
85+
NAME VARCHAR2(100)
8686
);
8787
CREATE TABLE SIMPLE_LIST_PARENT
8888
(
8989
ID NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
90-
NAME VARCHAR(100)
90+
NAME VARCHAR2(100)
9191
);
9292
CREATE TABLE element_no_id
9393
(
94-
CONTENT VARCHAR(100),
94+
CONTENT VARCHAR2(100),
9595
SIMPLE_LIST_PARENT_key NUMBER,
9696
SIMPLE_LIST_PARENT NUMBER,
9797
LIST_PARENT_key NUMBER,
@@ -107,85 +107,85 @@ CREATE TABLE BYTE_ARRAY_OWNER
107107
CREATE TABLE CHAIN4
108108
(
109109
FOUR NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
110-
FOUR_VALUE VARCHAR(20)
110+
FOUR_VALUE VARCHAR2(20)
111111
);
112112

113113

114114
CREATE TABLE CHAIN3
115115
(
116116
THREE NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
117-
THREE_VALUE VARCHAR(20),
117+
THREE_VALUE VARCHAR2(20),
118118
CHAIN4 NUMBER,
119119
FOREIGN KEY (CHAIN4) REFERENCES CHAIN4 (FOUR)
120120
);
121121

122122
CREATE TABLE CHAIN2
123123
(
124124
TWO NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
125-
TWO_VALUE VARCHAR(20),
125+
TWO_VALUE VARCHAR2(20),
126126
CHAIN3 NUMBER,
127127
FOREIGN KEY (CHAIN3) REFERENCES CHAIN3 (THREE)
128128
);
129129

130130
CREATE TABLE CHAIN1
131131
(
132132
ONE NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
133-
ONE_VALUE VARCHAR(20),
133+
ONE_VALUE VARCHAR2(20),
134134
CHAIN2 NUMBER,
135135
FOREIGN KEY (CHAIN2) REFERENCES CHAIN2 (TWO)
136136
);
137137

138138
CREATE TABLE CHAIN0
139139
(
140140
ZERO NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
141-
ZERO_VALUE VARCHAR(20),
141+
ZERO_VALUE VARCHAR2(20),
142142
CHAIN1 NUMBER,
143143
FOREIGN KEY (CHAIN1) REFERENCES CHAIN1 (ONE)
144144
);
145145

146146
CREATE TABLE NO_ID_CHAIN4
147147
(
148148
FOUR NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
149-
FOUR_VALUE VARCHAR(20)
149+
FOUR_VALUE VARCHAR2(20)
150150
);
151151

152152
CREATE TABLE NO_ID_CHAIN3
153153
(
154-
THREE_VALUE VARCHAR(20),
154+
THREE_VALUE VARCHAR2(20),
155155
NO_ID_CHAIN4 NUMBER,
156156
FOREIGN KEY (NO_ID_CHAIN4) REFERENCES NO_ID_CHAIN4 (FOUR)
157157
);
158158

159159
CREATE TABLE NO_ID_CHAIN2
160160
(
161-
TWO_VALUE VARCHAR(20),
161+
TWO_VALUE VARCHAR2(20),
162162
NO_ID_CHAIN4 NUMBER,
163163
FOREIGN KEY (NO_ID_CHAIN4) REFERENCES NO_ID_CHAIN4 (FOUR)
164164
);
165165

166166
CREATE TABLE NO_ID_CHAIN1
167167
(
168-
ONE_VALUE VARCHAR(20),
168+
ONE_VALUE VARCHAR2(20),
169169
NO_ID_CHAIN4 NUMBER,
170170
FOREIGN KEY (NO_ID_CHAIN4) REFERENCES NO_ID_CHAIN4 (FOUR)
171171
);
172172

173173
CREATE TABLE NO_ID_CHAIN0
174174
(
175-
ZERO_VALUE VARCHAR(20),
175+
ZERO_VALUE VARCHAR2(20),
176176
NO_ID_CHAIN4 NUMBER,
177177
FOREIGN KEY (NO_ID_CHAIN4) REFERENCES NO_ID_CHAIN4 (FOUR)
178178
);
179179

180180
CREATE TABLE NO_ID_LIST_CHAIN4
181181
(
182182
FOUR NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
183-
FOUR_VALUE VARCHAR(20)
183+
FOUR_VALUE VARCHAR2(20)
184184
);
185185

186186
CREATE TABLE NO_ID_LIST_CHAIN3
187187
(
188-
THREE_VALUE VARCHAR(20),
188+
THREE_VALUE VARCHAR2(20),
189189
NO_ID_LIST_CHAIN4 NUMBER,
190190
NO_ID_LIST_CHAIN4_KEY NUMBER,
191191
PRIMARY KEY (NO_ID_LIST_CHAIN4,
@@ -195,7 +195,7 @@ CREATE TABLE NO_ID_LIST_CHAIN3
195195

196196
CREATE TABLE NO_ID_LIST_CHAIN2
197197
(
198-
TWO_VALUE VARCHAR(20),
198+
TWO_VALUE VARCHAR2(20),
199199
NO_ID_LIST_CHAIN4 NUMBER,
200200
NO_ID_LIST_CHAIN4_KEY NUMBER,
201201
NO_ID_LIST_CHAIN3_KEY NUMBER,
@@ -213,7 +213,7 @@ CREATE TABLE NO_ID_LIST_CHAIN2
213213

214214
CREATE TABLE NO_ID_LIST_CHAIN1
215215
(
216-
ONE_VALUE VARCHAR(20),
216+
ONE_VALUE VARCHAR2(20),
217217
NO_ID_LIST_CHAIN4 NUMBER,
218218
NO_ID_LIST_CHAIN4_KEY NUMBER,
219219
NO_ID_LIST_CHAIN3_KEY NUMBER,
@@ -235,7 +235,7 @@ CREATE TABLE NO_ID_LIST_CHAIN1
235235

236236
CREATE TABLE NO_ID_LIST_CHAIN0
237237
(
238-
ZERO_VALUE VARCHAR(20),
238+
ZERO_VALUE VARCHAR2(20),
239239
NO_ID_LIST_CHAIN4 NUMBER,
240240
NO_ID_LIST_CHAIN4_KEY NUMBER,
241241
NO_ID_LIST_CHAIN3_KEY NUMBER,
@@ -264,25 +264,25 @@ CREATE TABLE NO_ID_LIST_CHAIN0
264264
CREATE TABLE NO_ID_MAP_CHAIN4
265265
(
266266
FOUR NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
267-
FOUR_VALUE VARCHAR(20)
267+
FOUR_VALUE VARCHAR2(20)
268268
);
269269

270270
CREATE TABLE NO_ID_MAP_CHAIN3
271271
(
272-
THREE_VALUE VARCHAR(20),
272+
THREE_VALUE VARCHAR2(20),
273273
NO_ID_MAP_CHAIN4 NUMBER,
274-
NO_ID_MAP_CHAIN4_KEY VARCHAR(20),
274+
NO_ID_MAP_CHAIN4_KEY VARCHAR2(20),
275275
PRIMARY KEY (NO_ID_MAP_CHAIN4,
276276
NO_ID_MAP_CHAIN4_KEY),
277277
FOREIGN KEY (NO_ID_MAP_CHAIN4) REFERENCES NO_ID_MAP_CHAIN4 (FOUR)
278278
);
279279

280280
CREATE TABLE NO_ID_MAP_CHAIN2
281281
(
282-
TWO_VALUE VARCHAR(20),
282+
TWO_VALUE VARCHAR2(20),
283283
NO_ID_MAP_CHAIN4 NUMBER,
284-
NO_ID_MAP_CHAIN4_KEY VARCHAR(20),
285-
NO_ID_MAP_CHAIN3_KEY VARCHAR(20),
284+
NO_ID_MAP_CHAIN4_KEY VARCHAR2(20),
285+
NO_ID_MAP_CHAIN3_KEY VARCHAR2(20),
286286
PRIMARY KEY (NO_ID_MAP_CHAIN4,
287287
NO_ID_MAP_CHAIN4_KEY,
288288
NO_ID_MAP_CHAIN3_KEY),
@@ -297,11 +297,11 @@ CREATE TABLE NO_ID_MAP_CHAIN2
297297

298298
CREATE TABLE NO_ID_MAP_CHAIN1
299299
(
300-
ONE_VALUE VARCHAR(20),
300+
ONE_VALUE VARCHAR2(20),
301301
NO_ID_MAP_CHAIN4 NUMBER,
302-
NO_ID_MAP_CHAIN4_KEY VARCHAR(20),
303-
NO_ID_MAP_CHAIN3_KEY VARCHAR(20),
304-
NO_ID_MAP_CHAIN2_KEY VARCHAR(20),
302+
NO_ID_MAP_CHAIN4_KEY VARCHAR2(20),
303+
NO_ID_MAP_CHAIN3_KEY VARCHAR2(20),
304+
NO_ID_MAP_CHAIN2_KEY VARCHAR2(20),
305305
PRIMARY KEY (NO_ID_MAP_CHAIN4,
306306
NO_ID_MAP_CHAIN4_KEY,
307307
NO_ID_MAP_CHAIN3_KEY,
@@ -319,12 +319,12 @@ CREATE TABLE NO_ID_MAP_CHAIN1
319319

320320
CREATE TABLE NO_ID_MAP_CHAIN0
321321
(
322-
ZERO_VALUE VARCHAR(20),
322+
ZERO_VALUE VARCHAR2(20),
323323
NO_ID_MAP_CHAIN4 NUMBER,
324-
NO_ID_MAP_CHAIN4_KEY VARCHAR(20),
325-
NO_ID_MAP_CHAIN3_KEY VARCHAR(20),
326-
NO_ID_MAP_CHAIN2_KEY VARCHAR(20),
327-
NO_ID_MAP_CHAIN1_KEY VARCHAR(20),
324+
NO_ID_MAP_CHAIN4_KEY VARCHAR2(20),
325+
NO_ID_MAP_CHAIN3_KEY VARCHAR2(20),
326+
NO_ID_MAP_CHAIN2_KEY VARCHAR2(20),
327+
NO_ID_MAP_CHAIN1_KEY VARCHAR2(20),
328328
PRIMARY KEY (NO_ID_MAP_CHAIN4,
329329
NO_ID_MAP_CHAIN4_KEY,
330330
NO_ID_MAP_CHAIN3_KEY,
@@ -352,8 +352,8 @@ CREATE TABLE VERSIONED_AGGREGATE
352352
CREATE TABLE WITH_READ_ONLY
353353
(
354354
ID NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
355-
NAME VARCHAR(200),
356-
READ_ONLY VARCHAR(200) DEFAULT 'from-db'
355+
NAME VARCHAR2(200),
356+
READ_ONLY VARCHAR2(200) DEFAULT 'from-db'
357357
);
358358

359359

@@ -372,35 +372,35 @@ CREATE TABLE WITH_ID_ONLY
372372
CREATE TABLE WITH_INSERT_ONLY
373373
(
374374
ID NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
375-
INSERT_ONLY VARCHAR(100)
375+
INSERT_ONLY VARCHAR2(100)
376376
);
377377

378378
CREATE TABLE MULTIPLE_COLLECTIONS
379379
(
380380
ID NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
381-
NAME VARCHAR(100)
381+
NAME VARCHAR2(100)
382382
);
383383

384384
CREATE TABLE SET_ELEMENT
385385
(
386386
MULTIPLE_COLLECTIONS NUMBER,
387-
NAME VARCHAR(100)
387+
NAME VARCHAR2(100)
388388
);
389389

390390
CREATE TABLE LIST_ELEMENT
391391
(
392392
MULTIPLE_COLLECTIONS NUMBER,
393393
MULTIPLE_COLLECTIONS_KEY INT,
394-
NAME VARCHAR(100)
394+
NAME VARCHAR2(100)
395395
);
396396

397397
CREATE TABLE MAP_ELEMENT
398398
(
399399
MULTIPLE_COLLECTIONS NUMBER,
400-
MULTIPLE_COLLECTIONS_KEY VARCHAR(10),
400+
MULTIPLE_COLLECTIONS_KEY VARCHAR2(10),
401401
ENUM_MAP_OWNER NUMBER,
402-
ENUM_MAP_OWNER_KEY VARCHAR(10),
403-
NAME VARCHAR(100)
402+
ENUM_MAP_OWNER_KEY VARCHAR2(10),
403+
NAME VARCHAR2(100)
404404
);
405405

406406
CREATE TABLE AUTHOR
@@ -411,48 +411,48 @@ CREATE TABLE AUTHOR
411411
CREATE TABLE BOOK
412412
(
413413
AUTHOR NUMBER,
414-
NAME VARCHAR(100)
414+
NAME VARCHAR2(100)
415415
);
416416

417417
CREATE TABLE ENUM_MAP_OWNER
418418
(
419419
ID NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
420-
NAME VARCHAR(100)
420+
NAME VARCHAR2(100)
421421
);
422422

423423
CREATE TABLE WITH_ONE_TO_ONE
424424
(
425-
ID VARCHAR(100)
425+
ID VARCHAR2(100)
426426
);
427427

428428
CREATE TABLE REFERENCED
429429
(
430-
"renamed" VARCHAR(100),
430+
"renamed" VARCHAR2(100),
431431
ID NUMBER
432432
);
433433
CREATE TABLE FIRST
434434
(
435435
ID NUMBER NOT NULL PRIMARY KEY,
436-
NAME VARCHAR(20) NOT NULL
436+
NAME VARCHAR2(20) NOT NULL
437437
);
438438

439439
CREATE TABLE SEC
440440
(
441441
ID NUMBER NOT NULL PRIMARY KEY,
442442
FIRST NUMBER NOT NULL,
443-
NAME VARCHAR(20) NOT NULL,
443+
NAME VARCHAR2(20) NOT NULL,
444444
FOREIGN KEY (FIRST) REFERENCES FIRST (ID)
445445
);
446446

447447
CREATE TABLE THIRD
448448
(
449449
SEC NUMBER NOT NULL,
450-
NAME VARCHAR(20) NOT NULL,
450+
NAME VARCHAR2(20) NOT NULL,
451451
FOREIGN KEY (SEC) REFERENCES SEC (ID)
452452
);
453453

454454
CREATE TABLE BEFORE_CONVERT_CALLBACK_FOR_SAVE_BATCH
455455
(
456-
ID VARCHAR(50) PRIMARY KEY,
457-
NAME VARCHAR(50)
456+
ID VARCHAR2(50) PRIMARY KEY,
457+
NAME VARCHAR2(50)
458458
);

‎spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryIntegrationTests-oracle.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ CREATE TABLE LEAF
4545
CREATE TABLE WITH_DELIMITED_COLUMN
4646
(
4747
ID NUMBER GENERATED BY DEFAULT ON NULL AS IDENTITY PRIMARY KEY,
48-
"ORG.XTUNIT.IDENTIFIER" VARCHAR(100),
49-
STYPE VARCHAR(100)
48+
"ORG.XTUNIT.IDENTIFIER" VARCHAR2(100),
49+
STYPE VARCHAR2(100)
5050
);
5151

5252
CREATE TABLE ENTITY_WITH_SEQUENCE

‎spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithCollectionsIntegrationTests-oracle.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CREATE TABLE DUMMY_ENTITY (
88

99
CREATE TABLE ELEMENT (
1010
ID NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY,
11-
CONTENT VARCHAR(100),
11+
CONTENT VARCHAR2(100),
1212
DUMMY_ENTITY NUMBER
1313
);

‎spring-data-jdbc/src/test/resources/org.springframework.data.jdbc.repository/JdbcRepositoryWithListsIntegrationTests-oracle.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CREATE TABLE DUMMY_ENTITY
1414
CREATE TABLE ELEMENT
1515
(
1616
ID NUMBER GENERATED BY DEFAULT ON NULL AS IDENTITY PRIMARY KEY,
17-
CONTENT VARCHAR(100),
17+
CONTENT VARCHAR2(100),
1818
DUMMY_ENTITY_KEY NUMBER,
1919
DUMMY_ENTITY NUMBER
2020
);
@@ -31,7 +31,7 @@ CREATE TABLE intermediate
3131
);
3232
CREATE TABLE leaf
3333
(
34-
name VARCHAR(100),
34+
name VARCHAR2(100),
3535
intermediate NUMBER NOT NULL,
3636
intermediate_key NUMBER NOT NULL
3737
);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
DROP TABLE CAR;
2-
CREATE TABLE CAR ( id NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY, model VARCHAR(100));
2+
CREATE TABLE CAR ( id NUMBER GENERATED by default on null as IDENTITY PRIMARY KEY, model VARCHAR2(100));

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /