Browse Source

Fix for issue #3327 - may not solve issue with mariaDB but works for MySQL.

pull/4089/head
mike12345567 5 years ago
parent
commit
116bccfd73
  1. 4
      packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
  2. 2
      packages/server/src/integrations/mysql.ts

4
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte

@ -38,6 +38,7 @@
const LINK_TYPE = FIELDS.LINK.type
const STRING_TYPE = FIELDS.STRING.type
const NUMBER_TYPE = FIELDS.NUMBER.type
const DATE_TYPE = FIELDS.DATETIME.type
const dispatch = createEventDispatcher()
const PROHIBITED_COLUMN_NAMES = ["type", "_id", "_rev", "tableId"]
@ -256,6 +257,9 @@
) {
fieldToCheck.constraints.numericality = {}
}
if (fieldToCheck.type === DATE_TYPE && !fieldToCheck.constraints.datetime) {
fieldToCheck.constraints.datetime = {}
}
}
function checkErrors(fieldInfo) {

2
packages/server/src/integrations/mysql.ts

@ -134,7 +134,7 @@ module MySQLModule {
false
)
const tableNames = tablesResp.map(
(obj: any) => obj[`Tables_in_${database.toLowerCase()}`]
(obj: any) => obj[`Tables_in_${database}`] || obj[`Tables_in_${database.toLowerCase()}`]
)
for (let tableName of tableNames) {
const primaryKeys = []

Loading…
Cancel
Save