Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
82f2be67
Commit
82f2be67
authored
Feb 02, 2015
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fix a bug causing Insert into ODBC to fail when the column name is
UTF8 encoded. modified: storage/connect/tabodbc.cpp
parent
6a783719
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
storage/connect/tabodbc.cpp
storage/connect/tabodbc.cpp
+7
-4
No files found.
storage/connect/tabodbc.cpp
View file @
82f2be67
...
...
@@ -379,7 +379,7 @@ int TDBODBC::Decode(char *txt, char *buf, size_t n)
/***********************************************************************/
char
*
TDBODBC
::
MakeSQL
(
PGLOBAL
g
,
bool
cnt
)
{
char
*
colist
,
*
tabname
,
*
sql
,
buf
[
64
];
char
*
colist
,
*
tabname
,
*
sql
,
buf
[
NAM_LEN
*
3
];
LPCSTR
schmp
=
NULL
,
catp
=
NULL
;
int
len
,
ncol
=
0
;
bool
first
=
true
;
...
...
@@ -492,7 +492,7 @@ char *TDBODBC::MakeSQL(PGLOBAL g, bool cnt)
/***********************************************************************/
char
*
TDBODBC
::
MakeInsert
(
PGLOBAL
g
)
{
char
*
stmt
,
*
colist
,
*
valist
;
char
*
stmt
,
*
colist
,
*
valist
,
buf
[
NAM_LEN
*
3
]
;
// char *tk = "`";
int
len
=
0
;
bool
b
=
FALSE
;
...
...
@@ -519,10 +519,13 @@ char *TDBODBC::MakeInsert(PGLOBAL g)
}
else
b
=
true
;
// Column name can be in UTF-8 encoding
Decode
(
colp
->
GetName
(),
buf
,
sizeof
(
buf
));
if
(
Quote
)
strcat
(
strcat
(
strcat
(
colist
,
Quote
),
colp
->
GetName
()
),
Quote
);
strcat
(
strcat
(
strcat
(
colist
,
Quote
),
buf
),
Quote
);
else
strcat
(
colist
,
colp
->
GetName
()
);
strcat
(
colist
,
buf
);
strcat
(
valist
,
"?"
);
// Parameter marker
}
// endfor colp
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment