xorm/xorm
xorm/xorm
63
355
Fork 204
Code Issues 368 Pull Requests 16 Actions Releases 35 Activity

Correct default detection in MariaDB >= 10.2.7 #1778

Merged
lunny merged 7 commits from zeripath/xorm:fix-defaults-sync2-mysql into master 2020-09-02 12:38:38 +00:00
Conversation 5 Commits 7 Files Changed 2 +45 -5
zeripath commented 2020-08-30 10:49:08 +00:00
Contributor
Copy Link

MariaDB in version 10.2.7 changed the reporting of COLUMN_DEFAULT in
INFORMATION_SCHEMA.COLUMNS to quote string values.

This PR adds a version detection test to the columns query.

References: https://jira.mariadb.org/browse/MDEV-13132
References: https://jira.mariadb.org/browse/MDEV-15390

Signed-off-by: Andrew Thornton art27@cantab.net

MariaDB in version 10.2.7 changed the reporting of COLUMN_DEFAULT in INFORMATION_SCHEMA.COLUMNS to quote string values. This PR adds a version detection test to the columns query. References: https://jira.mariadb.org/browse/MDEV-13132 References: https://jira.mariadb.org/browse/MDEV-15390 Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath added 1 commit 2020-08-30 10:49:10 +00:00
Correct default detection in MariaDB >= 10.2.7 
MariaDB in version 10.2.7 changed the reporting of COLUMN_DEFAULT in
INFORMATION_SCHEMA.COLUMNS to quote string values.

This PR adds a version detection test to the columns query.

References: https://jira.mariadb.org/browse/MDEV-13132
References: https://jira.mariadb.org/browse/MDEV-15390

Signed-off-by: Andrew Thornton <art27@cantab.net>
7f8feb6535
zeripath added 1 commit 2020-08-30 10:51:01 +00:00
fix drone 
Signed-off-by: Andrew Thornton <art27@cantab.net>
Some checks failed
continuous-integration/drone/pr Build is failing
Details
d78b56a77f
zeripath added 1 commit 2020-08-30 11:09:24 +00:00
Try MariaDB 10.4 
Signed-off-by: Andrew Thornton <art27@cantab.net>
All checks were successful
continuous-integration/drone/pr Build is passing
Details
1e7e901d3b
zeripath commented 2020-08-30 11:24:06 +00:00
Author
Contributor
Copy Link

Interesting MariaDB 10.5 fails the TestForUpdate test. MariaDB 10.4 does work.

Interesting MariaDB 10.5 fails the TestForUpdate test. MariaDB 10.4 does work.
lunny commented 2020-08-31 08:08:44 +00:00
Owner
Copy Link

Please resolve the conflicts

Please resolve the conflicts
lunny added this to the 1.0.4 milestone 2020-08-31 08:09:05 +00:00
zeripath added 2 commits 2020-08-31 12:20:59 +00:00
tidy up appearance of the alreadyQuoted SQL string 
Signed-off-by: Andrew Thornton <art27@cantab.net>
Some checks failed
continuous-integration/drone/pr Build is failing
Details
e50415a956
zeripath commented 2020-08-31 12:21:34 +00:00
Author
Contributor
Copy Link

Conflicts resolved.

Conflicts resolved.
zeripath added 1 commit 2020-08-31 20:56:33 +00:00
try again ci 
Signed-off-by: Andrew Thornton <art27@cantab.net>
Some checks failed
continuous-integration/drone/pr Build is failing
Details
4864905be0
zeripath commented 2020-08-31 21:20:23 +00:00
Author
Contributor
Copy Link

CI Failures not related to this PR.

CI Failures not related to this PR.
zeripath added 1 commit 2020-08-31 21:23:58 +00:00
try again ci 
Signed-off-by: Andrew Thornton <art27@cantab.net>
All checks were successful
continuous-integration/drone/pr Build is passing
Details
1b399da66c
lunny approved these changes 2020-09-02 12:37:07 +00:00
Dismissed
lunny merged commit f8c91ec4a3 into master 2020-09-02 12:37:22 +00:00
zeripath deleted branch fix-defaults-sync2-mysql 2020-09-02 20:14:41 +00:00
zeripath commented 2020-09-02 20:19:07 +00:00
Author
Contributor
Copy Link

Thanks @lunny

Thanks @lunny
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
backport/done

   
backport/v1

   
blocked
  
db
oracle

  
db
sqlserver

  
duplicate
  
feature
cache

  
frontport/done

   
frontport/main

   
invalid
  
kind
breaking

  
kind
bug

  
kind
build

  
kind
dependencies

  
kind
docs

  
kind
driver

  
kind
enhancement

  
kind
feature

  
kind
performance

  
kind
proposal

  
kind
question

  
kind
refactor

  
kind
testing

  
need
feedback

  
need
test

  
proposal:accepted

   
RaspBerry Pi

   
regression

   
skip-changelog

   
upstream

   
wip

   
wontfix
No Label
backport/done
backport/v1
blocked
db
oracle
db
sqlserver
duplicate
feature
cache
frontport/done
frontport/main
invalid
kind
breaking
kind
bug
kind
build
kind
dependencies
kind
docs
kind
driver
kind
enhancement
kind
feature
kind
performance
kind
proposal
kind
question
kind
refactor
kind
testing
need
feedback
need
test
proposal:accepted
RaspBerry Pi
regression
skip-changelog
upstream
wip
wontfix
Milestone
Clear milestone
No items
No Milestone
1.0.4
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: xorm/xorm#1778
No description provided.
Delete Branch "zeripath/xorm:fix-defaults-sync2-mysql"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?