mirror
/
facilmap
kopia lustrzana https://github.com/FacilMap/facilmap
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Round integers to avoid error on Postgres

v3
Candid Dauth 2023-11-15 06:48:26 +01:00
rodzic f456da2e7a
commit 9e2d259f07
3 zmienionych plików z 48 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

36
server/src/database/line.ts
Wyświetl plik

@ -90,9 +90,30 @@ export default class DatabaseLines {
width : { type: DataTypes.INTEGER.UNSIGNED, allowNull: false, defaultValue: 4, validate: { min: 1 } },
name : { type: DataTypes.TEXT, allowNull: true, get: function(this: LineModel) { return this.getDataValue("name") || "Untitled line"; } },
distance : { type: DataTypes.FLOAT(24, 2).UNSIGNED, allowNull: true },
time : { type: DataTypes.INTEGER.UNSIGNED, allowNull: true },
ascent : { type: DataTypes.INTEGER.UNSIGNED, allowNull: true },
descent : { type: DataTypes.INTEGER.UNSIGNED, allowNull: true },
time : {
type: DataTypes.INTEGER.UNSIGNED,
allowNull: true,
set: function(this: LineModel, v: number | null) {
// Round number to avoid integer column error in Postgres
this.setDataValue("time", v != null ? Math.round(v) : v);
}
},
ascent : {
type: DataTypes.INTEGER.UNSIGNED,
allowNull: true,
set: function(this: LineModel, v: number | null) {
// Round number to avoid integer column error in Postgres
this.setDataValue("ascent", v != null ? Math.round(v) : v);
}
},
descent : {
type: DataTypes.INTEGER.UNSIGNED,
allowNull: true,
set: function(this: LineModel, v: number | null) {
// Round number to avoid integer column error in Postgres
this.setDataValue("descent", v != null ? Math.round(v) : v);
}
},
top: getLatType(),
bottom: getLatType(),
left: getLonType(),
@ -120,7 +141,14 @@ export default class DatabaseLines {
pos: getPosType(),
zoom: { type: DataTypes.INTEGER.UNSIGNED, allowNull: false, validate: { min: 1, max: 20 } },
idx: { type: DataTypes.INTEGER.UNSIGNED, allowNull: false },
ele: { type: DataTypes.INTEGER, allowNull: true }
ele: {
type: DataTypes.INTEGER,
allowNull: true,
set: function(this: LinePointModel, v: number | null) {
// Round number to avoid integer column error in Postgres
this.setDataValue("ele", v != null ? Math.round(v) : v);
}
}
}, {
sequelize: this._db._conn,
indexes: [

9
server/src/database/marker.ts
Wyświetl plik

@ -43,7 +43,14 @@ export default class DatabaseMarkers {
size : { type: DataTypes.INTEGER.UNSIGNED, allowNull: false, defaultValue: 25, validate: { min: 15 } },
symbol : { type: DataTypes.TEXT, allowNull: true },
shape : { type: DataTypes.TEXT, allowNull: true },
ele: { type: DataTypes.INTEGER, allowNull: true }
ele: {
type: DataTypes.INTEGER,
allowNull: true,
set: function(this: MarkerModel, v: number | null) {
// Round number to avoid integer column error in Postgres
this.setDataValue("ele", v != null ? Math.round(v) : v);
}
}
}, {
sequelize: this._db._conn,
// pos index is created in migration

9
server/src/database/route.ts
Wyświetl plik

@ -40,7 +40,14 @@ export default class DatabaseRoutes {
pos: getPosType(),
zoom: { type: DataTypes.INTEGER.UNSIGNED, allowNull: false, validate: { min: 1, max: 20 } },
idx: { type: DataTypes.INTEGER.UNSIGNED, allowNull: false },
ele: { type: DataTypes.INTEGER, allowNull: true }
ele: {
type: DataTypes.INTEGER,
allowNull: true,
set: function(this: RoutePointModel, v: number | null) {
// Round number to avoid integer column error in Postgres
this.setDataValue("ele", v != null ? Math.round(v) : v);
}
}
}, {
sequelize: this._db._conn,
indexes: [