Skip to content

Commit c2b0c1d

Browse files
stephenafamostephenafamo
authored
Merge pull request #1469 from KeitaShimura/fix/psql-integer-map-to-int32
fix(psql): map integer/serial to int32 instead of int
2 parents 3b1f527 + fe68a03 commit c2b0c1d

5 files changed

Lines changed: 185 additions & 86 deletions

File tree

‎drivers/sqlboiler-psql/driver/psql.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ func (p *PostgresDriver) TranslateColumnType(c drivers.Column) drivers.Column {
785785
case "bigint", "bigserial":
786786
c.Type = "null.Int64"
787787
case "integer", "serial":
788-
c.Type = "null.Int"
788+
c.Type = "null.Int32"
789789
case "oid":
790790
c.Type = "null.Uint32"
791791
case "smallint", "smallserial":
@@ -850,7 +850,7 @@ func (p *PostgresDriver) TranslateColumnType(c drivers.Column) drivers.Column {
850850
case "bigint", "bigserial":
851851
c.Type = "int64"
852852
case "integer", "serial":
853-
c.Type = "int"
853+
c.Type = "int32"
854854
case "oid":
855855
c.Type = "uint32"
856856
case "smallint", "smallserial":

‎drivers/sqlboiler-psql/driver/psql.golden.enums.json‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"columns": [
88
{
99
"name": "id",
10-
"type": "int",
10+
"type": "int32",
1111
"db_type": "integer",
1212
"default": "",
1313
"comment": "",
@@ -22,7 +22,7 @@
2222
},
2323
{
2424
"name": "parent_id",
25-
"type": "null.Int",
25+
"type": "null.Int32",
2626
"db_type": "integer",
2727
"default": "NULL",
2828
"comment": "",
@@ -37,7 +37,7 @@
3737
},
3838
{
3939
"name": "root_id",
40-
"type": "int",
40+
"type": "int32",
4141
"db_type": "integer",
4242
"default": "",
4343
"comment": "",
@@ -139,7 +139,7 @@
139139
"columns": [
140140
{
141141
"name": "id",
142-
"type": "int",
142+
"type": "int32",
143143
"db_type": "integer",
144144
"default": "nextval('sponsors_id_seq'::regclass)",
145145
"comment": "",
@@ -187,7 +187,7 @@
187187
"columns": [
188188
{
189189
"name": "id",
190-
"type": "int",
190+
"type": "int32",
191191
"db_type": "integer",
192192
"default": "nextval('tags_id_seq'::regclass)",
193193
"comment": "",
@@ -245,7 +245,7 @@
245245
"columns": [
246246
{
247247
"name": "id",
248-
"type": "int",
248+
"type": "int32",
249249
"db_type": "integer",
250250
"default": "nextval('type_monsters_id_seq'::regclass)",
251251
"comment": "",
@@ -905,7 +905,7 @@
905905
},
906906
{
907907
"name": "int_zero",
908-
"type": "null.Int",
908+
"type": "null.Int32",
909909
"db_type": "integer",
910910
"default": "NULL",
911911
"comment": "",
@@ -920,7 +920,7 @@
920920
},
921921
{
922922
"name": "int_one",
923-
"type": "null.Int",
923+
"type": "null.Int32",
924924
"db_type": "integer",
925925
"default": "NULL",
926926
"comment": "",
@@ -935,7 +935,7 @@
935935
},
936936
{
937937
"name": "int_two",
938-
"type": "int",
938+
"type": "int32",
939939
"db_type": "integer",
940940
"default": "",
941941
"comment": "",
@@ -950,7 +950,7 @@
950950
},
951951
{
952952
"name": "int_three",
953-
"type": "null.Int",
953+
"type": "null.Int32",
954954
"db_type": "integer",
955955
"default": "333333",
956956
"comment": "",
@@ -965,7 +965,7 @@
965965
},
966966
{
967967
"name": "int_four",
968-
"type": "int",
968+
"type": "int32",
969969
"db_type": "integer",
970970
"default": "444444",
971971
"comment": "",
@@ -980,7 +980,7 @@
980980
},
981981
{
982982
"name": "int_five",
983-
"type": "null.Int",
983+
"type": "null.Int32",
984984
"db_type": "integer",
985985
"default": "0",
986986
"comment": "",
@@ -995,7 +995,7 @@
995995
},
996996
{
997997
"name": "int_six",
998-
"type": "int",
998+
"type": "int32",
999999
"db_type": "integer",
10001000
"default": "0",
10011001
"comment": "",
@@ -1670,7 +1670,7 @@
16701670
},
16711671
{
16721672
"name": "integer_default",
1673-
"type": "null.Int",
1673+
"type": "null.Int32",
16741674
"db_type": "integer",
16751675
"default": "5",
16761676
"comment": "",
@@ -2651,7 +2651,7 @@
26512651
"columns": [
26522652
{
26532653
"name": "id",
2654-
"type": "int",
2654+
"type": "int32",
26552655
"db_type": "integer",
26562656
"default": "nextval('users_id_seq'::regclass)",
26572657
"comment": "",
@@ -2739,7 +2739,7 @@
27392739
"columns": [
27402740
{
27412741
"name": "video_id",
2742-
"type": "int",
2742+
"type": "int32",
27432743
"db_type": "integer",
27442744
"default": "",
27452745
"comment": "",
@@ -2754,7 +2754,7 @@
27542754
},
27552755
{
27562756
"name": "tag_id",
2757-
"type": "int",
2757+
"type": "int32",
27582758
"db_type": "integer",
27592759
"default": "",
27602760
"comment": "",
@@ -2814,7 +2814,7 @@
28142814
"columns": [
28152815
{
28162816
"name": "id",
2817-
"type": "int",
2817+
"type": "int32",
28182818
"db_type": "integer",
28192819
"default": "nextval('videos_id_seq'::regclass)",
28202820
"comment": "",
@@ -2829,7 +2829,7 @@
28292829
},
28302830
{
28312831
"name": "user_id",
2832-
"type": "int",
2832+
"type": "int32",
28332833
"db_type": "integer",
28342834
"default": "",
28352835
"comment": "",
@@ -2844,7 +2844,7 @@
28442844
},
28452845
{
28462846
"name": "sponsor_id",
2847-
"type": "null.Int",
2847+
"type": "null.Int32",
28482848
"db_type": "integer",
28492849
"default": "NULL",
28502850
"comment": "",
@@ -2925,7 +2925,7 @@
29252925
"columns": [
29262926
{
29272927
"name": "id",
2928-
"type": "null.Int",
2928+
"type": "null.Int32",
29292929
"db_type": "integer",
29302930
"default": "NULL",
29312931
"comment": "",
@@ -3585,7 +3585,7 @@
35853585
},
35863586
{
35873587
"name": "int_zero",
3588-
"type": "null.Int",
3588+
"type": "null.Int32",
35893589
"db_type": "integer",
35903590
"default": "NULL",
35913591
"comment": "",
@@ -3600,7 +3600,7 @@
36003600
},
36013601
{
36023602
"name": "int_one",
3603-
"type": "null.Int",
3603+
"type": "null.Int32",
36043604
"db_type": "integer",
36053605
"default": "NULL",
36063606
"comment": "",
@@ -3615,7 +3615,7 @@
36153615
},
36163616
{
36173617
"name": "int_two",
3618-
"type": "null.Int",
3618+
"type": "null.Int32",
36193619
"db_type": "integer",
36203620
"default": "NULL",
36213621
"comment": "",
@@ -3630,7 +3630,7 @@
36303630
},
36313631
{
36323632
"name": "int_three",
3633-
"type": "null.Int",
3633+
"type": "null.Int32",
36343634
"db_type": "integer",
36353635
"default": "NULL",
36363636
"comment": "",
@@ -3645,7 +3645,7 @@
36453645
},
36463646
{
36473647
"name": "int_four",
3648-
"type": "null.Int",
3648+
"type": "null.Int32",
36493649
"db_type": "integer",
36503650
"default": "NULL",
36513651
"comment": "",
@@ -3660,7 +3660,7 @@
36603660
},
36613661
{
36623662
"name": "int_five",
3663-
"type": "null.Int",
3663+
"type": "null.Int32",
36643664
"db_type": "integer",
36653665
"default": "NULL",
36663666
"comment": "",
@@ -3675,7 +3675,7 @@
36753675
},
36763676
{
36773677
"name": "int_six",
3678-
"type": "null.Int",
3678+
"type": "null.Int32",
36793679
"db_type": "integer",
36803680
"default": "NULL",
36813681
"comment": "",
@@ -4350,7 +4350,7 @@
43504350
},
43514351
{
43524352
"name": "integer_default",
4353-
"type": "null.Int",
4353+
"type": "null.Int32",
43544354
"db_type": "integer",
43554355
"default": "NULL",
43564356
"comment": "",
@@ -5326,7 +5326,7 @@
53265326
"columns": [
53275327
{
53285328
"name": "id",
5329-
"type": "null.Int",
5329+
"type": "null.Int32",
53305330
"db_type": "integer",
53315331
"default": "NULL",
53325332
"comment": "",
@@ -5986,7 +5986,7 @@
59865986
},
59875987
{
59885988
"name": "int_zero",
5989-
"type": "null.Int",
5989+
"type": "null.Int32",
59905990
"db_type": "integer",
59915991
"default": "NULL",
59925992
"comment": "",
@@ -6001,7 +6001,7 @@
60016001
},
60026002
{
60036003
"name": "int_one",
6004-
"type": "null.Int",
6004+
"type": "null.Int32",
60056005
"db_type": "integer",
60066006
"default": "NULL",
60076007
"comment": "",
@@ -6016,7 +6016,7 @@
60166016
},
60176017
{
60186018
"name": "int_two",
6019-
"type": "null.Int",
6019+
"type": "null.Int32",
60206020
"db_type": "integer",
60216021
"default": "NULL",
60226022
"comment": "",
@@ -6031,7 +6031,7 @@
60316031
},
60326032
{
60336033
"name": "int_three",
6034-
"type": "null.Int",
6034+
"type": "null.Int32",
60356035
"db_type": "integer",
60366036
"default": "NULL",
60376037
"comment": "",
@@ -6046,7 +6046,7 @@
60466046
},
60476047
{
60486048
"name": "int_four",
6049-
"type": "null.Int",
6049+
"type": "null.Int32",
60506050
"db_type": "integer",
60516051
"default": "NULL",
60526052
"comment": "",
@@ -6061,7 +6061,7 @@
60616061
},
60626062
{
60636063
"name": "int_five",
6064-
"type": "null.Int",
6064+
"type": "null.Int32",
60656065
"db_type": "integer",
60666066
"default": "NULL",
60676067
"comment": "",
@@ -6076,7 +6076,7 @@
60766076
},
60776077
{
60786078
"name": "int_six",
6079-
"type": "null.Int",
6079+
"type": "null.Int32",
60806080
"db_type": "integer",
60816081
"default": "NULL",
60826082
"comment": "",
@@ -6751,7 +6751,7 @@
67516751
},
67526752
{
67536753
"name": "integer_default",
6754-
"type": "null.Int",
6754+
"type": "null.Int32",
67556755
"db_type": "integer",
67566756
"default": "NULL",
67576757
"comment": "",
@@ -7727,7 +7727,7 @@
77277727
"columns": [
77287728
{
77297729
"name": "user_id",
7730-
"type": "null.Int",
7730+
"type": "null.Int32",
77317731
"db_type": "integer",
77327732
"default": "NULL",
77337733
"comment": "",
@@ -7742,7 +7742,7 @@
77427742
},
77437743
{
77447744
"name": "video_id",
7745-
"type": "null.Int",
7745+
"type": "null.Int32",
77467746
"db_type": "integer",
77477747
"default": "NULL",
77487748
"comment": "",
@@ -7757,7 +7757,7 @@
77577757
},
77587758
{
77597759
"name": "sponsor_id",
7760-
"type": "null.Int",
7760+
"type": "null.Int32",
77617761
"db_type": "integer",
77627762
"default": "NULL",
77637763
"comment": "",

0 commit comments

Comments
 (0)