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
4d5f5f4c
Commit
4d5f5f4c
authored
Feb 03, 2014
by
Alexander Barkov
Browse files
Options
Browse Files
Download
Plain Diff
Merg 10.0-connect -> 10.0
parents
a1a49ec9
bec94a15
Changes
37
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
37 changed files
with
1166 additions
and
262 deletions
+1166
-262
storage/connect/catalog.h
storage/connect/catalog.h
+2
-1
storage/connect/colblk.cpp
storage/connect/colblk.cpp
+10
-11
storage/connect/colblk.h
storage/connect/colblk.h
+4
-1
storage/connect/filamdbf.cpp
storage/connect/filamdbf.cpp
+13
-9
storage/connect/global.h
storage/connect/global.h
+2
-1
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+81
-34
storage/connect/ha_connect.h
storage/connect/ha_connect.h
+2
-1
storage/connect/myconn.cpp
storage/connect/myconn.cpp
+2
-1
storage/connect/mysql-test/connect/r/mysql_new.result
storage/connect/mysql-test/connect/r/mysql_new.result
+1
-1
storage/connect/mysql-test/connect/r/odbc_oracle.result
storage/connect/mysql-test/connect/r/odbc_oracle.result
+237
-0
storage/connect/mysql-test/connect/t/have_odbc_oracle.inc
storage/connect/mysql-test/connect/t/have_odbc_oracle.inc
+15
-0
storage/connect/mysql-test/connect/t/odbc_oracle.sql
storage/connect/mysql-test/connect/t/odbc_oracle.sql
+16
-0
storage/connect/mysql-test/connect/t/odbc_oracle.test
storage/connect/mysql-test/connect/t/odbc_oracle.test
+230
-0
storage/connect/myutil.cpp
storage/connect/myutil.cpp
+17
-6
storage/connect/odbconn.cpp
storage/connect/odbconn.cpp
+38
-36
storage/connect/plgdbutl.cpp
storage/connect/plgdbutl.cpp
+1
-1
storage/connect/rcmsg.c
storage/connect/rcmsg.c
+20
-20
storage/connect/reldef.cpp
storage/connect/reldef.cpp
+8
-6
storage/connect/reldef.h
storage/connect/reldef.h
+4
-2
storage/connect/tabcol.cpp
storage/connect/tabcol.cpp
+4
-4
storage/connect/tabcol.h
storage/connect/tabcol.h
+5
-5
storage/connect/tabdos.cpp
storage/connect/tabdos.cpp
+9
-6
storage/connect/tabfmt.cpp
storage/connect/tabfmt.cpp
+5
-5
storage/connect/tabmysql.cpp
storage/connect/tabmysql.cpp
+7
-4
storage/connect/tabodbc.cpp
storage/connect/tabodbc.cpp
+72
-45
storage/connect/tabodbc.h
storage/connect/tabodbc.h
+9
-6
storage/connect/tabsys.cpp
storage/connect/tabsys.cpp
+2
-2
storage/connect/tabutil.cpp
storage/connect/tabutil.cpp
+21
-15
storage/connect/tabwmi.cpp
storage/connect/tabwmi.cpp
+1
-1
storage/connect/tabxml.cpp
storage/connect/tabxml.cpp
+2
-2
storage/connect/user_connect.h
storage/connect/user_connect.h
+2
-2
storage/connect/valblk.cpp
storage/connect/valblk.cpp
+18
-2
storage/connect/value.cpp
storage/connect/value.cpp
+262
-22
storage/connect/value.h
storage/connect/value.h
+33
-2
storage/connect/xindex.cpp
storage/connect/xindex.cpp
+4
-3
storage/connect/xobject.cpp
storage/connect/xobject.cpp
+3
-1
storage/connect/xobject.h
storage/connect/xobject.h
+4
-4
No files found.
storage/connect/catalog.h
View file @
4d5f5f4c
...
...
@@ -41,7 +41,8 @@ typedef struct _colinfo {
int
Offset
;
int
Length
;
int
Key
;
int
Prec
;
int
Precision
;
int
Scale
;
int
Opt
;
char
*
Remark
;
char
*
Datefmt
;
...
...
storage/connect/colblk.cpp
View file @
4d5f5f4c
...
...
@@ -38,6 +38,7 @@ COLBLK::COLBLK(PCOLDEF cdp, PTDB tdbp, int i)
Format
=
cdp
->
F
;
Opt
=
cdp
->
Opt
;
Long
=
cdp
->
Long
;
Precision
=
cdp
->
Precision
;
Buf_Type
=
cdp
->
Buf_Type
;
ColUse
|=
cdp
->
Flags
;
// Used by CONNECT
Nullable
=
!!
(
cdp
->
Flags
&
U_NULLS
);
...
...
@@ -47,6 +48,7 @@ COLBLK::COLBLK(PCOLDEF cdp, PTDB tdbp, int i)
memset
(
&
Format
,
0
,
sizeof
(
FORMAT
));
Opt
=
0
;
Long
=
0
;
Precision
=
0
;
Buf_Type
=
TYPE_ERROR
;
Nullable
=
false
;
Unsigned
=
false
;
...
...
@@ -165,7 +167,7 @@ bool COLBLK::CheckSort(PTDB tdbp)
/* InitValue: prepare a column block for read operation. */
/* Now we use Format.Length for the len parameter to avoid strings */
/* to be truncated when converting from string to coded string. */
/* Added in version 1.5 is the arguments Get
Precision() and Domain
*/
/* Added in version 1.5 is the arguments Get
Scale() and Domain
*/
/* in calling AllocateValue. Domain is used for TYPE_DATE only. */
/***********************************************************************/
bool
COLBLK
::
InitValue
(
PGLOBAL
g
)
...
...
@@ -173,12 +175,9 @@ bool COLBLK::InitValue(PGLOBAL g)
if
(
Value
)
return
false
;
// Already done
// Unsigned can be set only for valid value types
int
prec
=
(
Unsigned
)
?
1
:
GetPrecision
();
// Allocate a Value object
if
(
!
(
Value
=
AllocateValue
(
g
,
Buf_Type
,
Format
.
Length
,
prec
,
GetDomain
())))
if
(
!
(
Value
=
AllocateValue
(
g
,
Buf_Type
,
Precision
,
GetScale
(),
Unsigned
,
GetDomain
())))
return
true
;
AddStatus
(
BUF_READY
);
...
...
@@ -270,7 +269,7 @@ SPCBLK::SPCBLK(PCOLUMN cp)
:
COLBLK
((
PCOLDEF
)
NULL
,
cp
->
GetTo_Table
()
->
GetTo_Tdb
(),
0
)
{
Name
=
(
char
*
)
cp
->
GetName
();
Long
=
0
;
Precision
=
Long
=
0
;
Buf_Type
=
TYPE_ERROR
;
}
// end of SPCBLK constructor
...
...
@@ -290,7 +289,7 @@ void SPCBLK::WriteColumn(PGLOBAL g)
/***********************************************************************/
RIDBLK
::
RIDBLK
(
PCOLUMN
cp
,
bool
rnm
)
:
SPCBLK
(
cp
)
{
Long
=
10
;
Precision
=
Long
=
10
;
Buf_Type
=
TYPE_INT
;
Rnm
=
rnm
;
*
Format
.
Type
=
'N'
;
...
...
@@ -313,7 +312,7 @@ void RIDBLK::ReadColumn(PGLOBAL g)
FIDBLK
::
FIDBLK
(
PCOLUMN
cp
)
:
SPCBLK
(
cp
)
{
//Is_Key = 2; for when the MUL table indexed reading will be implemented.
Long
=
_MAX_PATH
;
Precision
=
Long
=
_MAX_PATH
;
Buf_Type
=
TYPE_STRING
;
*
Format
.
Type
=
'C'
;
Format
.
Length
=
Long
;
...
...
@@ -348,7 +347,7 @@ void FIDBLK::ReadColumn(PGLOBAL g)
TIDBLK
::
TIDBLK
(
PCOLUMN
cp
)
:
SPCBLK
(
cp
)
{
//Is_Key = 2; for when the MUL table indexed reading will be implemented.
Long
=
64
;
Precision
=
Long
=
64
;
Buf_Type
=
TYPE_STRING
;
*
Format
.
Type
=
'C'
;
Format
.
Length
=
Long
;
...
...
@@ -375,7 +374,7 @@ void TIDBLK::ReadColumn(PGLOBAL g)
SIDBLK
::
SIDBLK
(
PCOLUMN
cp
)
:
SPCBLK
(
cp
)
{
//Is_Key = 2; for when the MUL table indexed reading will be implemented.
Long
=
64
;
Precision
=
Long
=
64
;
Buf_Type
=
TYPE_STRING
;
*
Format
.
Type
=
'C'
;
Format
.
Length
=
Long
;
...
...
storage/connect/colblk.h
View file @
4d5f5f4c
...
...
@@ -29,7 +29,8 @@ class DllExport COLBLK : public XOBJECT {
// Implementation
virtual
int
GetType
(
void
)
{
return
TYPE_COLBLK
;}
virtual
int
GetResultType
(
void
)
{
return
Buf_Type
;}
virtual
int
GetPrecision
(
void
)
{
return
Format
.
Prec
;}
virtual
int
GetScale
(
void
)
{
return
Format
.
Prec
;}
virtual
int
GetPrecision
(
void
)
{
return
Precision
;}
virtual
int
GetLength
(
void
)
{
return
Long
;}
virtual
int
GetLengthEx
(
void
);
virtual
int
GetAmType
()
{
return
TYPE_AM_ERROR
;}
...
...
@@ -53,6 +54,7 @@ class DllExport COLBLK : public XOBJECT {
PSZ
GetDomain
(
void
)
{
return
(
Cdp
)
?
Cdp
->
Decode
:
NULL
;}
PSZ
GetDesc
(
void
)
{
return
(
Cdp
)
?
Cdp
->
Desc
:
NULL
;}
PSZ
GetFmt
(
void
)
{
return
(
Cdp
)
?
Cdp
->
Fmt
:
NULL
;}
bool
IsUnsigned
(
void
)
{
return
Unsigned
;}
bool
IsNullable
(
void
)
{
return
Nullable
;}
void
SetNullable
(
bool
b
)
{
Nullable
=
b
;}
...
...
@@ -88,6 +90,7 @@ class DllExport COLBLK : public XOBJECT {
int
Opt
;
// Cluster/sort information
int
Buf_Type
;
// Data type
int
Long
;
// Internal length in table
int
Precision
;
// Column length (as for ODBC)
FORMAT
Format
;
// Output format
ushort
ColUse
;
// Column usage
ushort
Status
;
// Column read status
...
...
storage/connect/filamdbf.cpp
View file @
4d5f5f4c
...
...
@@ -178,18 +178,18 @@ static int dbfhead(PGLOBAL g, FILE *file, PSZ fn, DBFHEADER *buf)
/****************************************************************************/
PQRYRES
DBFColumns
(
PGLOBAL
g
,
const
char
*
fn
,
BOOL
info
)
{
static
int
buftyp
[]
=
{
TYPE_STRING
,
TYPE_SHORT
,
TYPE_STRING
,
TYPE_INT
,
TYPE_INT
,
TYPE_SHORT
};
static
XFLD
fldtyp
[]
=
{
FLD_NAME
,
FLD_TYPE
,
FLD_TYPENAME
,
FLD_PREC
,
FLD_LENGTH
,
FLD_SCALE
};
static
unsigned
int
length
[]
=
{
11
,
6
,
8
,
10
,
10
,
6
};
int
buftyp
[]
=
{
TYPE_STRING
,
TYPE_SHORT
,
TYPE_STRING
,
TYPE_INT
,
TYPE_INT
,
TYPE_SHORT
};
XFLD
fldtyp
[]
=
{
FLD_NAME
,
FLD_TYPE
,
FLD_TYPENAME
,
FLD_PREC
,
FLD_LENGTH
,
FLD_SCALE
};
unsigned
int
length
[]
=
{
11
,
6
,
8
,
10
,
10
,
6
};
char
buf
[
2
],
filename
[
_MAX_PATH
];
int
ncol
=
sizeof
(
buftyp
)
/
sizeof
(
int
);
int
rc
,
type
,
len
,
field
,
fields
;
BOOL
bad
;
DBFHEADER
mainhead
;
DESCRIPTOR
thisfield
;
FILE
*
infile
;
FILE
*
infile
=
NULL
;
PQRYRES
qrp
;
PCOLRES
crp
;
...
...
@@ -228,8 +228,12 @@ PQRYRES DBFColumns(PGLOBAL g, const char *fn, BOOL info)
qrp
=
PlgAllocResult
(
g
,
ncol
,
fields
,
IDS_COLUMNS
+
3
,
buftyp
,
fldtyp
,
length
,
true
,
false
);
if
(
info
||
!
qrp
)
if
(
info
||
!
qrp
)
{
if
(
infile
)
fclose
(
infile
);
return
qrp
;
}
// endif info
if
(
trace
)
{
htrc
(
"Structure of %s
\n
"
,
filename
);
...
...
@@ -271,11 +275,11 @@ PQRYRES DBFColumns(PGLOBAL g, const char *fn, BOOL info)
type
=
TYPE_STRING
;
break
;
case
'N'
:
type
=
(
thisfield
.
Decimals
)
?
TYPE_
FLOAT
type
=
(
thisfield
.
Decimals
)
?
TYPE_
DOUBLE
:
(
len
>
10
)
?
TYPE_BIGINT
:
TYPE_INT
;
break
;
case
'F'
:
type
=
TYPE_
FLOAT
;
type
=
TYPE_
DOUBLE
;
break
;
case
'D'
:
type
=
TYPE_DATE
;
// Is this correct ???
...
...
storage/connect/global.h
View file @
4d5f5f4c
...
...
@@ -77,12 +77,13 @@
#define TYPE_SEMX 0
/* Initial semantic function type? */
#define TYPE_ERROR 0
#define TYPE_STRING 1
#define TYPE_
FLOAT
2
#define TYPE_
DOUBLE
2
#define TYPE_SHORT 3
#define TYPE_TINY 4
#define TYPE_BIGINT 5
#define TYPE_LIST 6
#define TYPE_INT 7
#define TYPE_DECIM 9
#if defined(OS32)
#define SYS_STAMP "OS32"
...
...
storage/connect/ha_connect.cc
View file @
4d5f5f4c
...
...
@@ -862,12 +862,14 @@ void *ha_connect::GetColumnOption(PGLOBAL g, void *field, PCOLINFO pcf)
return
fldp
;
}
// endif special
pcf
->
Prec
=
0
;
pcf
->
Scale
=
0
;
pcf
->
Opt
=
(
fop
)
?
(
int
)
fop
->
opt
:
0
;
if
((
pcf
->
Length
=
fp
->
field_length
)
<
0
)
pcf
->
Length
=
256
;
// BLOB?
pcf
->
Precision
=
pcf
->
Length
;
if
(
fop
)
{
pcf
->
Offset
=
(
int
)
fop
->
offset
;
// pcf->Freq= fop->freq;
...
...
@@ -898,13 +900,17 @@ void *ha_connect::GetColumnOption(PGLOBAL g, void *field, PCOLINFO pcf)
// Find if collation name ends by _ci
if
(
!
strcmp
(
cp
+
strlen
(
cp
)
-
3
,
"_ci"
))
{
pcf
->
Prec
=
1
;
// Case insensitive
pcf
->
Scale
=
1
;
// Case insensitive
pcf
->
Opt
=
0
;
// Prevent index opt until it is safe
}
// endif ci
break
;
case
TYPE_FLOAT
:
pcf
->
Prec
=
max
(
min
(
fp
->
decimals
(),
((
unsigned
)
pcf
->
Length
-
2
)),
0
);
case
TYPE_DOUBLE
:
pcf
->
Scale
=
max
(
min
(
fp
->
decimals
(),
((
unsigned
)
pcf
->
Length
-
2
)),
0
);
break
;
case
TYPE_DECIM
:
pcf
->
Precision
=
((
Field_new_decimal
*
)
fp
)
->
precision
;
pcf
->
Scale
=
fp
->
decimals
();
break
;
case
TYPE_DATE
:
// Field_length is only used for DATE columns
...
...
@@ -1109,12 +1115,12 @@ PTDB ha_connect::GetTDB(PGLOBAL g)
||
tdbp
->
GetAmType
()
==
TYPE_AM_XML
))
{
tp
=
tdbp
;
// tp->SetMode(xmod);
}
else
if
((
tp
=
CntGetTDB
(
g
,
table_name
,
xmod
,
this
)))
}
else
if
((
tp
=
CntGetTDB
(
g
,
table_name
,
xmod
,
this
)))
{
valid_query_id
=
xp
->
last_query_id
;
else
tp
->
SetMode
(
xmod
);
}
else
printf
(
"GetTDB: %s
\n
"
,
g
->
Message
);
tp
->
SetMode
(
xmod
);
return
tp
;
}
// end of GetTDB
...
...
@@ -1326,7 +1332,7 @@ int ha_connect::MakeRecord(char *buf)
value
->
FormatValue
(
sdvalout
,
fmt
);
p
=
sdvalout
->
GetCharValue
();
break
;
case
TYPE_
FLOAT
:
case
TYPE_
DOUBLE
:
p
=
NULL
;
break
;
case
TYPE_STRING
:
...
...
@@ -1422,7 +1428,7 @@ int ha_connect::ScanRecord(PGLOBAL g, uchar *buf)
value
->
Reset
();
}
else
switch
(
value
->
GetType
())
{
case
TYPE_
FLOAT
:
case
TYPE_
DOUBLE
:
value
->
SetValue
(
fp
->
val_real
());
break
;
case
TYPE_DATE
:
...
...
@@ -2743,8 +2749,10 @@ int ha_connect::delete_all_rows()
}
// end of delete_all_rows
bool
ha_connect
::
check_privileges
(
THD
*
thd
,
PTOS
options
)
bool
ha_connect
::
check_privileges
(
THD
*
thd
,
PTOS
options
,
char
*
dbn
)
{
const
char
*
db
=
(
dbn
&&
*
dbn
)
?
dbn
:
NULL
;
if
(
!
options
->
type
)
{
if
(
options
->
srcdef
)
options
->
type
=
"MYSQL"
;
...
...
@@ -2794,7 +2802,7 @@ bool ha_connect::check_privileges(THD *thd, PTOS options)
case
TAB_MAC
:
case
TAB_WMI
:
case
TAB_OEM
:
return
check_access
(
thd
,
FILE_ACL
,
NULL
,
NULL
,
NULL
,
0
,
0
);
return
check_access
(
thd
,
FILE_ACL
,
db
,
NULL
,
NULL
,
0
,
0
);
// This is temporary until a solution is found
case
TAB_TBL
:
...
...
@@ -3020,12 +3028,6 @@ int ha_connect::external_lock(THD *thd, int lock_type)
if
(
!
g
)
DBUG_RETURN
(
HA_ERR_INTERNAL_ERROR
);
if
(
lock_type
!=
F_UNLCK
&&
check_privileges
(
thd
,
options
))
{
strcpy
(
g
->
Message
,
"This operation requires the FILE privilege"
);
printf
(
"%s
\n
"
,
g
->
Message
);
DBUG_RETURN
(
HA_ERR_INTERNAL_ERROR
);
}
// endif check_privileges
// Action will depend on lock_type
switch
(
lock_type
)
{
case
F_WRLCK
:
...
...
@@ -3129,7 +3131,17 @@ int ha_connect::external_lock(THD *thd, int lock_type)
if
(
adp
)
// Here we do make the new indexes
tdp
->
MakeIndex
(
g
,
adp
,
true
);
if
(
tdp
->
MakeIndex
(
g
,
adp
,
true
)
==
RC_FX
)
{
//#if defined(_DEBUG)
// Make it a warning to avoid crash on debug
push_warning
(
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
0
,
g
->
Message
);
rc
=
0
;
//#else // !_DEBUG
// my_message(ER_UNKNOWN_ERROR, g->Message, MYF(0));
// rc= HA_ERR_INTERNAL_ERROR;
//#endif // !DEBUG
}
// endif MakeIndex
}
// endif Mode
...
...
@@ -3151,6 +3163,14 @@ int ha_connect::external_lock(THD *thd, int lock_type)
DBUG_RETURN
(
rc
);
}
// endif MODE_ANY
DBUG_ASSERT
(
table
&&
table
->
s
);
if
(
check_privileges
(
thd
,
options
,
table
->
s
->
db
.
str
))
{
strcpy
(
g
->
Message
,
"This operation requires the FILE privilege"
);
printf
(
"%s
\n
"
,
g
->
Message
);
DBUG_RETURN
(
HA_ERR_INTERNAL_ERROR
);
}
// endif check_privileges
// Table mode depends on the query type
newmode
=
CheckMode
(
g
,
thd
,
newmode
,
&
xcheck
,
&
cras
);
...
...
@@ -3196,9 +3216,6 @@ int ha_connect::external_lock(THD *thd, int lock_type)
xmod
=
newmode
;
if
(
!
table
)
rc
=
3
;
// Logical error
// Delay open until used fields are known
}
// endif tdbp
...
...
@@ -3311,7 +3328,7 @@ filename_to_dbname_and_tablename(const char *filename,
memcpy
(
database
,
d
.
str
,
d
.
length
);
database
[
d
.
length
]
=
'\0'
;
return
false
;
}
}
// end of filename_to_dbname_and_tablename
/**
...
...
@@ -3369,7 +3386,7 @@ int ha_connect::delete_or_rename_table(const char *name, const char *to)
// Now we can work
pos
=
share
->
option_struct
;
if
(
check_privileges
(
thd
,
pos
))
if
(
check_privileges
(
thd
,
pos
,
db
))
{
free_table_share
(
share
);
DBUG_RETURN
(
HA_ERR_INTERNAL_ERROR
);
...
...
@@ -3508,7 +3525,7 @@ static bool add_fields(PGLOBAL g,
length
=
(
char
*
)
PlugSubAlloc
(
g
,
NULL
,
8
);
sprintf
(
length
,
"%d"
,
len
);
if
(
typ
==
TYPE_
FLOAT
)
{
if
(
typ
==
TYPE_
DOUBLE
)
{
decimals
=
(
char
*
)
PlugSubAlloc
(
g
,
NULL
,
8
);
sprintf
(
decimals
,
"%d"
,
min
(
dec
,
(
min
(
len
,
31
)
-
1
)));
}
// endif dec
...
...
@@ -3574,7 +3591,11 @@ static bool add_field(String *sql, const char *field_name, int typ,
error
|=
sql
->
append
(
','
);
// dec must be < len and < 31
error
|=
sql
->
append_ulonglong
(
min
(
dec
,
(
min
(
len
,
31
)
-
1
)));
}
// endif dec
}
else
if
(
dec
>
0
&&
!
strcmp
(
type
,
"DECIMAL"
))
{
error
|=
sql
->
append
(
','
);
// dec must be < len
error
|=
sql
->
append_ulonglong
(
min
(
dec
,
len
-
1
));
}
// endif dec
error
|=
sql
->
append
(
')'
);
}
// endif len
...
...
@@ -3590,7 +3611,7 @@ static bool add_field(String *sql, const char *field_name, int typ,
if
(
dft
&&
*
dft
)
{
error
|=
sql
->
append
(
" DEFAULT "
);
if
(
IsTypeChar
(
typ
))
{
if
(
!
IsTypeNum
(
typ
))
{
error
|=
sql
->
append
(
"'"
);
error
|=
sql
->
append_for_single_quote
(
dft
,
strlen
(
dft
));
error
|=
sql
->
append
(
"'"
);
...
...
@@ -4086,7 +4107,7 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd,
case
TAB_TBL
:
case
TAB_XCL
:
case
TAB_OCCUR
:
if
(
!
stricmp
(
tab
,
create_info
->
alias
)
&&
if
(
!
s
rc
&&
!
s
tricmp
(
tab
,
create_info
->
alias
)
&&
(
!
db
||
!
stricmp
(
db
,
table_s
->
db
.
str
)))
sprintf
(
g
->
Message
,
"A %s table cannot refer to itself"
,
topt
->
type
);
else
...
...
@@ -4295,11 +4316,15 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd,
}
else
typ
=
plgtyp
;
// Some data sources do not count dec in length (prec)
if
(
typ
==
TYPE_FLOAT
)
prec
+=
(
dec
+
2
);
// To be safe
else
dec
=
0
;
switch
(
typ
)
{
case
TYPE_DOUBLE
:
// Some data sources do not count dec in length (prec)
prec
+=
(
dec
+
2
);
// To be safe
case
TYPE_DECIM
:
break
;
default:
dec
=
0
;
}
// endswitch typ
}
// endif ttp
#endif // ODBC_SUPPORT
...
...
@@ -4307,7 +4332,7 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd,
// Make the arguments as required by add_fields
if
(
typ
==
TYPE_DATE
)
prec
=
0
;
else
if
(
typ
==
TYPE_
FLOAT
)
else
if
(
typ
==
TYPE_
DOUBLE
)
prec
=
len
;
// Now add the field
...
...
@@ -4336,6 +4361,28 @@ static int connect_assisted_discovery(handlerton *hton, THD* thd,
return
HA_ERR_INTERNAL_ERROR
;
}
// end of connect_assisted_discovery
/**
Get the database name from a qualified table name.
*/
char
*
ha_connect
::
GetDBfromName
(
const
char
*
name
)
{
char
*
db
,
dbname
[
128
],
tbname
[
128
];
if
(
filename_to_dbname_and_tablename
(
name
,
dbname
,
sizeof
(
dbname
),
tbname
,
sizeof
(
tbname
)))
*
dbname
=
0
;
if
(
*
dbname
)
{
assert
(
xp
&&
xp
->
g
);
db
=
(
char
*
)
PlugSubAlloc
(
xp
->
g
,
NULL
,
strlen
(
dbname
+
1
));
strcpy
(
db
,
dbname
);
}
else
db
=
NULL
;
return
db
;
}
// end of GetDBfromName
/**
@brief
create() is called to create a database. The variable name will have the name
...
...
@@ -4394,7 +4441,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
DBUG_RETURN
(
HA_ERR_INTERNAL_ERROR
);
}
// endif ttp
if
(
check_privileges
(
thd
,
options
))
if
(
check_privileges
(
thd
,
options
,
GetDBfromName
(
name
)
))
DBUG_RETURN
(
HA_ERR_INTERNAL_ERROR
);
if
(
options
->
data_charset
)
{
...
...
storage/connect/ha_connect.h
View file @
4d5f5f4c
...
...
@@ -445,8 +445,9 @@ const char *GetValStr(OPVAL vop, bool neg);
int
optimize
(
THD
*
thd
,
HA_CHECK_OPT
*
check_opt
);
protected:
bool
check_privileges
(
THD
*
thd
,
PTOS
options
);
bool
check_privileges
(
THD
*
thd
,
PTOS
options
,
char
*
dbn
);
MODE
CheckMode
(
PGLOBAL
g
,
THD
*
thd
,
MODE
newmode
,
bool
*
chk
,
bool
*
cras
);
char
*
GetDBfromName
(
const
char
*
name
);
// Members
static
ulong
num
;
// Tracable handler number
...
...
storage/connect/myconn.cpp
View file @
4d5f5f4c
...
...
@@ -723,7 +723,8 @@ PQRYRES MYSQLC::GetResult(PGLOBAL g, bool pdb)
// For direct MySQL connection, display the MySQL date string
crp
->
Type
=
TYPE_STRING
;
crp
->
Prec
=
(
crp
->
Type
==
TYPE_FLOAT
)
?
fld
->
decimals
:
0
;
crp
->
Prec
=
(
crp
->
Type
==
TYPE_DOUBLE
||
crp
->
Type
==
TYPE_DECIM
)
?
fld
->
decimals
:
0
;
crp
->
Length
=
fld
->
max_length
;
crp
->
Clen
=
GetTypeSize
(
crp
->
Type
,
crp
->
Length
);
uns
=
(
fld
->
flags
&
(
UNSIGNED_FLAG
|
ZEROFILL_FLAG
))
?
true
:
false
;
...
...
storage/connect/mysql-test/connect/r/mysql_new.result
View file @
4d5f5f4c
...
...
@@ -141,7 +141,7 @@ t1 CREATE TABLE `t1` (
`e` bigint(20) DEFAULT NULL,
`f` double DEFAULT NULL,
`g` double DEFAULT NULL,
`h` d
ouble
(20,5) DEFAULT NULL
`h` d
ecimal
(20,5) DEFAULT NULL
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='MYSQL' `OPTION_LIST`='host=127.0.0.1,user=root,port=SLAVE_PORT'
SELECT * FROM t1;
a b c d e f g h
...
...
storage/connect/mysql-test/connect/r/odbc_oracle.result
0 → 100644
View file @
4d5f5f4c
Table Create Table
t1 CREATE TABLE `t1` (
`Name` varchar(256) NOT NULL,
`Description` varchar(256) NOT NULL
) ENGINE=CONNECT DEFAULT CHARSET=latin1 `TABLE_TYPE`='ODBC' `CATFUNC`='Sources'
SET NAMES utf8;
#
# Checking CATFUNC=Tables
#
# All tables in all schemas (filtered with WHERE)
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Tables;
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Table_Type Remark
MTR T1 TABLE
MTR T2 TABLE
MTR V1 VIEW
DROP TABLE t1;
# All tables in all schemas (filtered with WHERE)
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Tables TABNAME='%.%';
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Table_Type Remark
MTR T1 TABLE
MTR T2 TABLE
MTR V1 VIEW
DROP TABLE t1;
# All tables "T1" in all schemas (filtered with WHERE)
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Tables TABNAME='%.T1';
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Table_Type Remark
MTR T1 TABLE
DROP TABLE t1;
# All tables "T1" in all schemas (filtered with WHERE)
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Tables TABNAME='T1';
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Table_Type Remark
MTR T1 TABLE
DROP TABLE t1;
# Table "T1" in the schema "MTR"
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Tables TABNAME='MTR.T1';
SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Table_Type Remark
MTR T1 TABLE
DROP TABLE t1;
# All tables in the schema "MTR"
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Tables TABNAME='MTR.%';
SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Table_Type Remark
MTR T1 TABLE
MTR T2 TABLE
MTR V1 VIEW
DROP TABLE t1;
#
# Checking CATFUNC=Columns
#
# All columns in all schemas (limited with WHERE)
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Columns;
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
MTR T1 A 3 DECIMAL 38 40 0 10 1
MTR T1 B 6 NUMBER 38 40 0 0 1
MTR T2 A 12 VARCHAR2 64 64 0 0 1
MTR V1 A 3 DECIMAL 38 40 0 10 1
MTR V1 B 6 NUMBER 38 40 0 0 1
DROP TABLE t1;
# All columns in all schemas (limited with WHERE)
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Columns TABNAME='%.%';
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
MTR T1 A 3 DECIMAL 38 40 0 10 1
MTR T1 B 6 NUMBER 38 40 0 0 1
MTR T2 A 12 VARCHAR2 64 64 0 0 1
MTR V1 A 3 DECIMAL 38 40 0 10 1
MTR V1 B 6 NUMBER 38 40 0 0 1
DROP TABLE t1;
# All tables "T1" in all schemas (limited with WHERE)
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' CATFUNC=Columns TABNAME='%.T1';
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
MTR T1 A 3 DECIMAL 38 40 0 10 1
MTR T1 B 6 NUMBER 38 40 0 0 1
DROP TABLE t1;
# Table "T1" in the schema "MTR"
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Columns TABNAME='MTR.T1';
SELECT * FROM t1 ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
MTR T1 A 3 DECIMAL 38 40 0 10 1
MTR T1 B 6 NUMBER 38 40 0 0 1
DROP TABLE t1;
# All tables "T1" in all schemas (filtered with WHERE)
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC=Columns TABNAME='%.T1';
SELECT * FROM t1 WHERE Table_Schema='MTR' ORDER BY Table_Schema, Table_Name;
Table_Cat Table_Schema Table_Name Column_Name Data_Type Type_Name Column_Size Buffer_Length Decimal_Digits Radix Nullable Remarks
MTR T1 A 3 DECIMAL 38 40 0 10 1
MTR T1 B 6 NUMBER 38 40 0 0 1
DROP TABLE t1;
#
# Checking tables
#
# Table "T1" in the default schema ("MTR")
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
TABNAME='T1';
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`A` decimal(38,0) DEFAULT NULL,
`B` double(40,0) DEFAULT NULL
) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='T1'
SELECT * FROM t1 ORDER BY A;
A B
10 1000000000
20 1000000000000
30 1000000000000000
CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
`A` decimal(38,0) DEFAULT NULL,
`B` double(40,0) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT * FROM t2;
A B
10 1000000000
20 1000000000000
30 1000000000000000
DROP TABLE t2;
CREATE VIEW v1 AS SELECT * FROM t1;
SELECT * FROM v1;
A B
10 1000000000
20 1000000000000
30 1000000000000000
DROP VIEW v1;
DROP TABLE t1;
# Table "T1" in the schema "MTR"
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
TABNAME='MTR.T1';
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`A` decimal(38,0) DEFAULT NULL,
`B` double(40,0) DEFAULT NULL
) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='MTR.T1'
SELECT * FROM t1;
A B
10 1000000000
20 1000000000000
30 1000000000000000
DROP TABLE t1;
# View "V1" in the schema "MTR"
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
TABNAME='MTR.V1';
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`A` decimal(38,0) DEFAULT NULL,
`B` double(40,0) DEFAULT NULL
) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='MTR.V1'
SELECT * FROM t1;
A B
10 1000000000
20 1000000000000
30 1000000000000000
CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
`A` decimal(38,0) DEFAULT NULL,
`B` double(40,0) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT * FROM t2;
A B
10 1000000000
20 1000000000000
30 1000000000000000
DROP TABLE t2;
CREATE VIEW v1 AS SELECT * FROM t1;
SELECT * FROM v1;
A B
10 1000000000
20 1000000000000
30 1000000000000000
DROP VIEW v1;
DROP TABLE t1;
# Table "T2" in the schema "MTR"
CREATE TABLE t1 ENGINE=CONNECT
TABLE_TYPE=ODBC CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
TABNAME='MTR.T2';
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`A` varchar(64) DEFAULT NULL
) ENGINE=CONNECT DEFAULT CHARSET=latin1 CONNECTION='DSN=ConnectEngineOracle;UID=mtr;PWD=mtr' `TABLE_TYPE`='ODBC' `TABNAME`='MTR.T2'
SELECT * FROM t1;
A
test
CREATE TABLE t2 AS SELECT * FROM t1;
SHOW CREATE TABLE t2;
Table Create Table
t2 CREATE TABLE `t2` (
`A` varchar(64) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
SELECT * FROM t2;
A
test
DROP TABLE t2;
CREATE VIEW v1 AS SELECT * FROM t1;
SELECT * FROM v1;
A
test
DROP VIEW v1;
DROP TABLE t1;
storage/connect/mysql-test/connect/t/have_odbc_oracle.inc
0 → 100644
View file @
4d5f5f4c
--
disable_query_log
--
error
0
,
ER_UNKNOWN_ERROR
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CATFUNC
=
Sources
;
if
(
$mysql_errno
)
{
Skip
No
ODBC
support
;
}
if
(
!
`SELECT count(*) FROM t1 WHERE Name='ConnectEngineOracle'`
)
{
DROP
TABLE
t1
;
Skip
Need
ODBC
data
source
ConnectEngineOracle
;
}
SHOW
CREATE
TABLE
t1
;
DROP
TABLE
t1
;
--
enable_query_log
storage/connect/mysql-test/connect/t/odbc_oracle.sql
0 → 100644
View file @
4d5f5f4c
DROP
USER
mtr
CASCADE
;
CREATE
USER
mtr
IDENTIFIED
BY
mtr
DEFAULT
TABLESPACE
users
TEMPORARY
TABLESPACE
temp
;
GRANT
CREATE
SESSION
TO
mtr
;
GRANT
CREATE
TABLE
TO
mtr
;
GRANT
CREATE
VIEW
TO
mtr
;
ALTER
USER
mtr
QUOTA
UNLIMITED
ON
USERS
;
CONNECT
mtr
/
mtr
;
CREATE
TABLE
t1
(
a
INT
,
b
NUMBER
);
INSERT
INTO
t1
VALUES
(
10
,
1000
*
1000
*
1000
);
INSERT
INTO
t1
VALUES
(
20
,
1000
*
1000
*
1000
*
1000
);
INSERT
INTO
t1
VALUES
(
30
,
1000
*
1000
*
1000
*
1000
*
1000
);
CREATE
VIEW
v1
AS
SELECT
*
FROM
t1
;
CREATE
TABLE
t2
(
a
VARCHAR
(
64
));
INSERT
INTO
t2
VALUES
(
'test'
);
storage/connect/mysql-test/connect/t/odbc_oracle.test
0 → 100644
View file @
4d5f5f4c
--
source
have_odbc_oracle
.
inc
#
# To configure your system to be able to run this test,
# follow through the following steps:
#
# 1. Install and configure Oracle database to start on the system startup.
#
# 2. Create user, database, schema and tables to be used by mtr:
# sqlplus system/manager < odbc_oracle.sql
#
# 3. Configure Oracle ODBC Driver for unixODBC (skip this step on Windows):
# Add these lines into /etc/odbcinst.ini:
# (the exact paths can vary)
#
#[Oracle11g]
#Description=Oracle ODBC driver for Oracle 11g
#Driver=/u01/app/oracle/product/11.2.0/xe/lib/libsqora.so.11.1
#Setup=
#FileUsage=
#CPTimeout=
#CPReuse=
#
# 4. Create a data source with the name "ConnectEngineOracle"
# - On Windows: use odbcadm.exe
# - On Linux: put these lines into /etc/odbc.ini
#
#[ConnectEngineOracle]
#Application Attributes=T
#Attributes=W
#BatchAutocommitMode=IfAllSuccessful
#CloseCursor=F
#DisableDPM=F
#DisableMTS=T
#Driver=Oracle11g
#DSN=ConnectEngineOracle
#EXECSchemaOpt=
#EXECSyntax=T
#Failover=T
#FailoverDelay=10
#FailoverRetryCount=10
#FetchBufferSize=64000
#ForceWCHAR=F
#Lobs=T
#Longs=T
#MetadataIdDefault=F
#QueryTimeout=T
#ResultSets=T
#ServerName=
#SQLGetData extensions=F
#Translation DLL=
#Translation Option=0
#UserID=
SET
NAMES
utf8
;
#
# Oracle does not support the third (catalog) level
# in SQLTables() and SQLColumns(), e.g.: CATFUNC=Tables TABNAME='%.%.%'.
# It returns a "Driver not capable" error on attept to use non-NULL catalog.
#
# But it works fine with the second (schema) level:
# CATFUNC=Tables TABNAME='%.%'
# Note, if schema level is not specified, or schema level is '%',
# tables for *all* schemas are returned
# (not only for the schema associated with the user.
#
# Note, schema and table names must be in upper case.
#
--
echo
#
--
echo
# Checking CATFUNC=Tables
--
echo
#
--
echo
--
echo
# All tables in all schemas (filtered with WHERE)
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Tables
;
SELECT
*
FROM
t1
WHERE
Table_Schema
=
'MTR'
ORDER
BY
Table_Schema
,
Table_Name
;
DROP
TABLE
t1
;
--
echo
# All tables in all schemas (filtered with WHERE)
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Tables
TABNAME
=
'%.%'
;
SELECT
*
FROM
t1
WHERE
Table_Schema
=
'MTR'
ORDER
BY
Table_Schema
,
Table_Name
;
DROP
TABLE
t1
;
--
echo
# All tables "T1" in all schemas (filtered with WHERE)
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Tables
TABNAME
=
'%.T1'
;
SELECT
*
FROM
t1
WHERE
Table_Schema
=
'MTR'
ORDER
BY
Table_Schema
,
Table_Name
;
DROP
TABLE
t1
;
--
echo
# All tables "T1" in all schemas (filtered with WHERE)
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Tables
TABNAME
=
'T1'
;
SELECT
*
FROM
t1
WHERE
Table_Schema
=
'MTR'
ORDER
BY
Table_Schema
,
Table_Name
;
DROP
TABLE
t1
;
--
echo
# Table "T1" in the schema "MTR"
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Tables
TABNAME
=
'MTR.T1'
;
SELECT
*
FROM
t1
ORDER
BY
Table_Schema
,
Table_Name
;
DROP
TABLE
t1
;
--
echo
# All tables in the schema "MTR"
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Tables
TABNAME
=
'MTR.%'
;
SELECT
*
FROM
t1
ORDER
BY
Table_Schema
,
Table_Name
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# Checking CATFUNC=Columns
--
echo
#
--
echo
--
echo
# All columns in all schemas (limited with WHERE)
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Columns
;
# Disable warnings to avoid "Result limited to 20000 lines"
--
disable_warnings
SELECT
*
FROM
t1
WHERE
Table_Schema
=
'MTR'
ORDER
BY
Table_Schema
,
Table_Name
;
--
enable_warnings
DROP
TABLE
t1
;
--
echo
# All columns in all schemas (limited with WHERE)
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Columns
TABNAME
=
'%.%'
;
# Disable warnings to avoid "Result limited to 20000 lines"
--
disable_warnings
SELECT
*
FROM
t1
WHERE
Table_Schema
=
'MTR'
ORDER
BY
Table_Schema
,
Table_Name
;
--
enable_warnings
DROP
TABLE
t1
;
--
echo
# All tables "T1" in all schemas (limited with WHERE)
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Columns
TABNAME
=
'%.T1'
;
SELECT
*
FROM
t1
WHERE
Table_Schema
=
'MTR'
ORDER
BY
Table_Schema
,
Table_Name
;
DROP
TABLE
t1
;
--
echo
# Table "T1" in the schema "MTR"
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Columns
TABNAME
=
'MTR.T1'
;
SELECT
*
FROM
t1
ORDER
BY
Table_Schema
,
Table_Name
;
DROP
TABLE
t1
;
--
echo
# All tables "T1" in all schemas (filtered with WHERE)
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
CATFUNC
=
Columns
TABNAME
=
'%.T1'
;
SELECT
*
FROM
t1
WHERE
Table_Schema
=
'MTR'
ORDER
BY
Table_Schema
,
Table_Name
;
DROP
TABLE
t1
;
--
echo
#
--
echo
# Checking tables
--
echo
#
--
echo
--
echo
# Table "T1" in the default schema ("MTR")
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
TABNAME
=
'T1'
;
SHOW
CREATE
TABLE
t1
;
SELECT
*
FROM
t1
ORDER
BY
A
;
CREATE
TABLE
t2
AS
SELECT
*
FROM
t1
;
SHOW
CREATE
TABLE
t2
;
SELECT
*
FROM
t2
;
DROP
TABLE
t2
;
CREATE
VIEW
v1
AS
SELECT
*
FROM
t1
;
SELECT
*
FROM
v1
;
DROP
VIEW
v1
;
DROP
TABLE
t1
;
--
echo
# Table "T1" in the schema "MTR"
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
TABNAME
=
'MTR.T1'
;
SHOW
CREATE
TABLE
t1
;
SELECT
*
FROM
t1
;
DROP
TABLE
t1
;
--
echo
# View "V1" in the schema "MTR"
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
TABNAME
=
'MTR.V1'
;
SHOW
CREATE
TABLE
t1
;
SELECT
*
FROM
t1
;
CREATE
TABLE
t2
AS
SELECT
*
FROM
t1
;
SHOW
CREATE
TABLE
t2
;
SELECT
*
FROM
t2
;
DROP
TABLE
t2
;
CREATE
VIEW
v1
AS
SELECT
*
FROM
t1
;
SELECT
*
FROM
v1
;
DROP
VIEW
v1
;
DROP
TABLE
t1
;
--
echo
# Table "T2" in the schema "MTR"
CREATE
TABLE
t1
ENGINE
=
CONNECT
TABLE_TYPE
=
ODBC
CONNECTION
=
'DSN=ConnectEngineOracle;UID=mtr;PWD=mtr'
TABNAME
=
'MTR.T2'
;
SHOW
CREATE
TABLE
t1
;
SELECT
*
FROM
t1
;
CREATE
TABLE
t2
AS
SELECT
*
FROM
t1
;
SHOW
CREATE
TABLE
t2
;
SELECT
*
FROM
t2
;
DROP
TABLE
t2
;
CREATE
VIEW
v1
AS
SELECT
*
FROM
t1
;
SELECT
*
FROM
v1
;
DROP
VIEW
v1
;
DROP
TABLE
t1
;
storage/connect/myutil.cpp
View file @
4d5f5f4c
...
...
@@ -42,9 +42,10 @@ int MYSQLtoPLG(char *typname, char *var)
!
stricmp
(
typname
,
"text"
)
||
!
stricmp
(
typname
,
"blob"
))
type
=
TYPE_STRING
;
else
if
(
!
stricmp
(
typname
,
"double"
)
||
!
stricmp
(
typname
,
"float"
)
||
!
stricmp
(
typname
,
"real"
)
||
!
stricmp
(
typname
,
"decimal"
)
||
!
stricmp
(
typname
,
"numeric"
))
type
=
TYPE_FLOAT
;
!
stricmp
(
typname
,
"real"
))
type
=
TYPE_DOUBLE
;
else
if
(
!
stricmp
(
typname
,
"decimal"
)
||
!
stricmp
(
typname
,
"numeric"
))
type
=
TYPE_DECIM
;
else
if
(
!
stricmp
(
typname
,
"date"
)
||
!
stricmp
(
typname
,
"datetime"
)
||
!
stricmp
(
typname
,
"time"
)
||
!
stricmp
(
typname
,
"timestamp"
)
||
!
stricmp
(
typname
,
"year"
))
...
...
@@ -95,7 +96,7 @@ enum enum_field_types PLGtoMYSQL(int type, bool dbf, char v)
case
TYPE_SHORT
:
mytype
=
MYSQL_TYPE_SHORT
;
break
;
case
TYPE_
FLOAT
:
case
TYPE_
DOUBLE
:
mytype
=
MYSQL_TYPE_DOUBLE
;
break
;
case
TYPE_DATE
:
...
...
@@ -114,6 +115,13 @@ enum enum_field_types PLGtoMYSQL(int type, bool dbf, char v)
case
TYPE_TINY
:
mytype
=
MYSQL_TYPE_TINY
;
break
;
case
TYPE_DECIM
:
#if !defined(ALPHA)
mytype
=
MYSQL_TYPE_NEWDECIMAL
;
#else // ALPHA
mytype
=
MYSQL_TYPE_DECIMAL
;
#endif // ALPHA
break
;
default:
mytype
=
MYSQL_TYPE_NULL
;
}
// endswitch mytype
...
...
@@ -129,7 +137,7 @@ const char *PLGtoMYSQLtype(int type, bool dbf, char v)
switch
(
type
)
{
case
TYPE_INT
:
return
"INT"
;
case
TYPE_SHORT
:
return
"SMALLINT"
;
case
TYPE_
FLOAT
:
return
"DOUBLE"
;
case
TYPE_
DOUBLE
:
return
"DOUBLE"
;
case
TYPE_DATE
:
return
dbf
?
"DATE"
:
(
v
==
'S'
)
?
"TIMESTAMP"
:
(
v
==
'D'
)
?
"DATE"
:
...
...
@@ -138,6 +146,7 @@ const char *PLGtoMYSQLtype(int type, bool dbf, char v)
case
TYPE_STRING
:
return
v
?
"VARCHAR"
:
"CHAR"
;
case
TYPE_BIGINT
:
return
"BIGINT"
;
case
TYPE_TINY
:
return
"TINYINT"
;
case
TYPE_DECIM
:
return
"DECIMAL"
;
default:
return
"CHAR(0)"
;
}
// endswitch mytype
...
...
@@ -170,9 +179,11 @@ int MYSQLtoPLG(int mytype, char *var)
#if !defined(ALPHA)
case
MYSQL_TYPE_NEWDECIMAL
:
#endif // !ALPHA)
type
=
TYPE_DECIM
;
break
;
case
MYSQL_TYPE_FLOAT
:
case
MYSQL_TYPE_DOUBLE
:
type
=
TYPE_
FLOAT
;
type
=
TYPE_
DOUBLE
;
break
;
case
MYSQL_TYPE_TIMESTAMP
:
case
MYSQL_TYPE_DATE
:
...
...
storage/connect/odbconn.cpp
View file @
4d5f5f4c
/************ Odbconn C++ Functions Source Code File (.CPP) ************/
/* Name: ODBCONN.CPP Version 1.
8
*/
/* Name: ODBCONN.CPP Version 1.
9
*/
/* */
/* (C) Copyright to the author Olivier BERTRAND 1998-2013 */
/* */
...
...
@@ -78,8 +78,9 @@ static short GetSQLType(int type)
case
TYPE_INT
:
tp
=
SQL_INTEGER
;
break
;
case
TYPE_DATE
:
tp
=
SQL_TIMESTAMP
;
break
;
case
TYPE_BIGINT
:
tp
=
SQL_BIGINT
;
break
;
// (-5)
case
TYPE_FLOAT
:
tp
=
SQL_DOUBLE
;
break
;
case
TYPE_TINY
:
tp
=
SQL_TINYINT
;
break
;
case
TYPE_DOUBLE
:
tp
=
SQL_DOUBLE
;
break
;
case
TYPE_TINY
:
tp
=
SQL_TINYINT
;
break
;
case
TYPE_DECIM
:
tp
=
SQL_DECIMAL
;
break
;
}
// endswitch type
return
tp
;
...
...
@@ -98,8 +99,9 @@ static int GetSQLCType(int type)
case
TYPE_INT
:
tp
=
SQL_C_LONG
;
break
;
case
TYPE_DATE
:
tp
=
SQL_C_TIMESTAMP
;
break
;
case
TYPE_BIGINT
:
tp
=
SQL_C_SBIGINT
;
break
;
case
TYPE_
FLOAT
:
tp
=
SQL_C_DOUBLE
;
break
;
case
TYPE_
DOUBLE
:
tp
=
SQL_C_DOUBLE
;
break
;
case
TYPE_TINY
:
tp
=
SQL_C_TINYINT
;
break
;
case
TYPE_DECIM
:
tp
=
SQL_C_CHAR
;
break
;
}
// endswitch type
return
tp
;
...
...
@@ -125,8 +127,9 @@ int TranslateSQLType(int stp, int prec, int& len, char& v)
break
;
case
SQL_NUMERIC
:
// 2
case
SQL_DECIMAL
:
// 3
type
=
(
prec
||
len
>
20
)
?
TYPE_FLOAT
:
(
len
>
10
)
?
TYPE_BIGINT
:
TYPE_INT
;
// type = (prec || len > 20) ? TYPE_DOUBLE
// : (len > 10) ? TYPE_BIGINT : TYPE_INT;
type
=
TYPE_DECIM
;
break
;
case
SQL_INTEGER
:
// 4
type
=
TYPE_INT
;
...
...
@@ -141,7 +144,7 @@ int TranslateSQLType(int stp, int prec, int& len, char& v)
case
SQL_FLOAT
:
// 6
case
SQL_REAL
:
// 7
case
SQL_DOUBLE
:
// 8
type
=
TYPE_
FLOAT
;
type
=
TYPE_
DOUBLE
;
break
;
case
SQL_DATETIME
:
// 9
// case SQL_DATE: // 9
...
...
@@ -312,9 +315,9 @@ PQRYRES ODBCColumns(PGLOBAL g, char *dsn, char *db, char *table,
}
else
if
(
!
maxres
)
maxres
=
20000
;
// n = ocp->GetMaxValue(SQL_MAX_
QUALIFIER
_NAME_LEN);
// n = ocp->GetMaxValue(SQL_MAX_
CATALOG
_NAME_LEN);
// length[0] = (n) ? (n + 1) : 0;
// n = ocp->GetMaxValue(SQL_MAX_
USER
_NAME_LEN);
// n = ocp->GetMaxValue(SQL_MAX_
SCHEMA
_NAME_LEN);
// length[1] = (n) ? (n + 1) : 0;
// n = ocp->GetMaxValue(SQL_MAX_TABLE_NAME_LEN);
// length[2] = (n) ? (n + 1) : 0;
...
...
@@ -425,7 +428,7 @@ PQRYRES MyODBCCols(PGLOBAL g, char *dsn, char *tab, bool info)
/************************************************************************/
/* Keep only the info used by ha_connect::pre_create. */
/************************************************************************/
qrp->Colresp = qrp->Colresp->Next->Next; // Skip
Owner
and Table names
qrp->Colresp = qrp->Colresp->Next->Next; // Skip
Schema
and Table names
crpt = qrp->Colresp->Next; // SQL type
crpl = crpt->Next->Next; // Length
...
...
@@ -440,7 +443,7 @@ PQRYRES MyODBCCols(PGLOBAL g, char *dsn, char *tab, bool info)
crpt->Kdata->SetValue(type, i);
// Some data sources do not count prec in length
if (type == TYPE_
FLOAT
)
if (type == TYPE_
DOUBLE
)
len += (prec + 2); // To be safe
// Could have been changed for blobs or numeric
...
...
@@ -588,9 +591,9 @@ PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *db, char *tabpat,
if
(
!
maxres
)
maxres
=
10000
;
// This is completely arbitrary
// n = ocp->GetMaxValue(SQL_MAX_
QUALIFIER
_NAME_LEN);
// n = ocp->GetMaxValue(SQL_MAX_
CATALOG
_NAME_LEN);
// length[0] = (n) ? (n + 1) : 0;
// n = ocp->GetMaxValue(SQL_MAX_
USER
_NAME_LEN);
// n = ocp->GetMaxValue(SQL_MAX_
SCHEMA
_NAME_LEN);
// length[1] = (n) ? (n + 1) : 0;
n
=
ocp
->
GetMaxValue
(
SQL_MAX_TABLE_NAME_LEN
);
length
[
2
]
=
(
n
)
?
(
n
+
1
)
:
128
;
...
...
@@ -678,9 +681,9 @@ PQRYRES ODBCPrimaryKeys(PGLOBAL g, ODBConn *op, char *dsn, char *table)
/************************************************************************/
n = ocp->GetMaxValue(SQL_MAX_COLUMNS_IN_TABLE);
maxres = (n) ? (int)n : 250;
n = ocp->GetMaxValue(SQL_MAX_
QUALIFIER
_NAME_LEN);
n = ocp->GetMaxValue(SQL_MAX_
CATALOG
_NAME_LEN);
length[0] = (n) ? (n + 1) : 128;
n = ocp->GetMaxValue(SQL_MAX_
USER
_NAME_LEN);
n = ocp->GetMaxValue(SQL_MAX_
SCHEMA
_NAME_LEN);
length[1] = (n) ? (n + 1) : 128;
n = ocp->GetMaxValue(SQL_MAX_TABLE_NAME_LEN);
length[2] = (n) ? (n + 1) : 128;
...
...
@@ -761,11 +764,11 @@ PQRYRES ODBCStatistics(PGLOBAL g, ODBConn *op, char *dsn, char *pat,
/************************************************************************/
n = 1 + ocp->GetMaxValue(SQL_MAX_COLUMNS_IN_INDEX);
maxres = (n) ? (int)n : 32;
n = ocp->GetMaxValue(SQL_MAX_
USER
_NAME_LEN);
n = ocp->GetMaxValue(SQL_MAX_
SCHEMA
_NAME_LEN);
length[1] = (n) ? (n + 1) : 128;
n = ocp->GetMaxValue(SQL_MAX_TABLE_NAME_LEN);
length[2] = length[5] = (n) ? (n + 1) : 128;
n = ocp->GetMaxValue(SQL_MAX_
QUALIFIER
_NAME_LEN);
n = ocp->GetMaxValue(SQL_MAX_
CATALOG
_NAME_LEN);
length[0] = length[4] = (n) ? (n + 1) : length[2];
n = ocp->GetMaxValue(SQL_MAX_COLUMN_NAME_LEN);
length[7] = (n) ? (n + 1) : 128;
...
...
@@ -1648,35 +1651,35 @@ int ODBConn::ExecuteSQL(void)
/***********************************************************************/
bool
ODBConn
::
BindParam
(
ODBCCOL
*
colp
)
{
void
*
buf
;
UWORD
n
=
colp
->
GetRank
();
SWORD
ct
,
sqlt
;
UDWORD
len
;
SQLLEN
*
strlen
=
colp
->
GetStrLen
();
RETCODE
rc
;
void
*
buf
;
int
buftype
=
colp
->
GetResultType
();
SQLUSMALLINT
n
=
colp
->
GetRank
();
SQLSMALLINT
ct
,
sqlt
,
dec
,
nul
;
SQLULEN
colsize
;
SQLLEN
len
;
SQLLEN
*
strlen
=
colp
->
GetStrLen
();
SQLRETURN
rc
;
#if 0
try
{
SWORD dec, nul;
rc = SQLDescribeParam(m_hstmt, n, &sqlt, &len, &dec, &nul);
rc
=
SQLDescribeParam
(
m_hstmt
,
n
,
&
sqlt
,
&
colsize
,
&
dec
,
&
nul
);
if
(
!
Check
(
rc
))
ThrowDBX(rc, m_hstmt);
ThrowDBX
(
rc
,
"SQLDescribeParam"
,
m_hstmt
);
}
catch
(
DBX
*
x
)
{
strcpy
(
m_G
->
Message
,
x
->
GetErrorMessage
(
0
));
colsize
=
colp
->
GetPrecision
();
sqlt
=
GetSQLType
(
buftype
);
}
// end try/catch
#endif // 0
buf
=
colp
->
GetBuffer
(
0
);
len
=
IsTypeNum
(
colp
->
GetResultType
())
?
0
:
colp
->
GetBuflen
();
ct
=
GetSQLCType
(
colp
->
GetResultType
());
sqlt
=
GetSQLType
(
colp
->
GetResultType
());
*
strlen
=
IsTypeNum
(
colp
->
GetResultType
())
?
0
:
SQL_NTS
;
len
=
IsTypeChar
(
buftype
)
?
colp
->
GetBuflen
()
:
0
;
ct
=
GetSQLCType
(
buftype
);
*
strlen
=
IsTypeChar
(
buftype
)
?
SQL_NTS
:
0
;
try
{
rc
=
SQLBindParameter
(
m_hstmt
,
n
,
SQL_PARAM_INPUT
,
ct
,
sqlt
,
len
,
0
,
buf
,
0
,
strlen
);
colsize
,
dec
,
buf
,
len
,
strlen
);
if
(
!
Check
(
rc
))
ThrowDBX
(
rc
,
"SQLBindParameter"
,
m_hstmt
);
...
...
@@ -2020,7 +2023,6 @@ bool ODBConn::GetDrivers(PQRYRES qrp)
return
rv
;
}
// end of GetDrivers
/***********************************************************************/
/* A helper class to split an optionally qualified table name into */
/* components. */
...
...
@@ -2039,7 +2041,7 @@ class SQLQualifiedName
{
S
->
str
=
str
;
S
->
length
=
length
;
}
// e
e
nd of lex_string_set
}
// end of lex_string_set
void
lex_string_shorten_down
(
MYSQL_LEX_STRING
*
S
,
size_t
offs
)
{
...
...
@@ -2228,7 +2230,7 @@ int ODBConn::GetCatInfo(CATPARM *cap)
((
STRBLK
*
)
crp
->
Kdata
)
->
SetSorted
(
true
);
}
// endif len
pval
[
n
]
=
AllocateValue
(
g
,
crp
->
Type
,
len
,
0
);
pval
[
n
]
=
AllocateValue
(
g
,
crp
->
Type
,
len
);
buffer
=
pval
[
n
]
->
GetTo_Val
();
vl
=
vlen
+
n
;
...
...
storage/connect/plgdbutl.cpp
View file @
4d5f5f4c
...
...
@@ -1523,7 +1523,7 @@ void PlugPutOut(PGLOBAL g, FILE *f, short t, void *v, uint n)
fprintf
(
f
,
"%s%s
\n
"
,
m
,
(
PSZ
)
v
);
break
;
case
TYPE_
FLOAT
:
case
TYPE_
DOUBLE
:
fprintf
(
f
,
"%s%lf
\n
"
,
m
,
*
(
double
*
)
v
);
break
;
...
...
storage/connect/rcmsg.c
View file @
4d5f5f4c
...
...
@@ -38,13 +38,13 @@ char *GetMsgid(int id)
case
IDS_13
:
p
=
"%s: cl de connexion invalide %d"
;
break
;
case
IDS_14
:
p
=
"SafeDB: %s rc=%d"
;
break
;
case
IDS_15
:
p
=
"Mauvaise Dll de communication appele par le moteur %s"
;
break
;
case
IDS_TAB_01
:
p
=
"
Qualificateur"
;
break
;
case
IDS_TAB_02
:
p
=
"
Propritaire"
;
break
;
case
IDS_TAB_01
:
p
=
"
Catalogue"
;
break
;
case
IDS_TAB_02
:
p
=
"
Schma"
;
break
;
case
IDS_TAB_03
:
p
=
"Nom"
;
break
;
case
IDS_TAB_04
:
p
=
"Type"
;
break
;
case
IDS_TAB_05
:
p
=
"Remarque"
;
break
;
case
IDS_COL_01
:
p
=
"
Qualif_Table"
;
break
;
case
IDS_COL_02
:
p
=
"
Prop_Tabl"
;
break
;
case
IDS_COL_01
:
p
=
"
Cat_Table"
;
break
;
case
IDS_COL_02
:
p
=
"
Schem_Table"
;
break
;
case
IDS_COL_03
:
p
=
"Nom_Table"
;
break
;
case
IDS_COL_04
:
p
=
"Nom_Colonne"
;
break
;
case
IDS_COL_05
:
p
=
"Type_Donnes"
;
break
;
...
...
@@ -70,18 +70,18 @@ char *GetMsgid(int id)
case
IDS_INF_13
:
p
=
"Nom_Type_Local"
;
break
;
case
IDS_INF_14
:
p
=
"Echelle_Minimum"
;
break
;
case
IDS_INF_15
:
p
=
"Echelle_Maximum"
;
break
;
case
IDS_PKY_01
:
p
=
"
Qualif_Table"
;
break
;
case
IDS_PKY_02
:
p
=
"
Prop_Table"
;
break
;
case
IDS_PKY_01
:
p
=
"
Cat_Table"
;
break
;
case
IDS_PKY_02
:
p
=
"
Schem_Table"
;
break
;
case
IDS_PKY_03
:
p
=
"Nom_Table"
;
break
;
case
IDS_PKY_04
:
p
=
"Nom_Colonne"
;
break
;
case
IDS_PKY_05
:
p
=
"Numro_Cl"
;
break
;
case
IDS_PKY_06
:
p
=
"Nom_Cl"
;
break
;
case
IDS_FKY_01
:
p
=
"PKTable_
Qualifier"
;
break
;
case
IDS_FKY_02
:
p
=
"PKTable_
Owner"
;
break
;
case
IDS_FKY_01
:
p
=
"PKTable_
Catalog"
;
break
;
case
IDS_FKY_02
:
p
=
"PKTable_
Schema"
;
break
;
case
IDS_FKY_03
:
p
=
"PKTable_Name"
;
break
;
case
IDS_FKY_04
:
p
=
"PKColumn_Name"
;
break
;
case
IDS_FKY_05
:
p
=
"FKTable_
Qualifier"
;
break
;
case
IDS_FKY_06
:
p
=
"FKTable_
Owner"
;
break
;
case
IDS_FKY_05
:
p
=
"FKTable_
Catalog"
;
break
;
case
IDS_FKY_06
:
p
=
"FKTable_
Schema"
;
break
;
case
IDS_FKY_07
:
p
=
"FKTable_Name"
;
break
;
case
IDS_FKY_08
:
p
=
"FKColumn_Name"
;
break
;
case
IDS_FKY_09
:
p
=
"Key_Seq"
;
break
;
...
...
@@ -89,8 +89,8 @@ char *GetMsgid(int id)
case
IDS_FKY_11
:
p
=
"Delete_Rule"
;
break
;
case
IDS_FKY_12
:
p
=
"FK_Name"
;
break
;
case
IDS_FKY_13
:
p
=
"PK_Name"
;
break
;
case
IDS_STA_01
:
p
=
"Table_
Qualifier"
;
break
;
case
IDS_STA_02
:
p
=
"Table_
Owner"
;
break
;
case
IDS_STA_01
:
p
=
"Table_
Catalog"
;
break
;
case
IDS_STA_02
:
p
=
"Table_
Schema"
;
break
;
case
IDS_STA_03
:
p
=
"Table_Name"
;
break
;
case
IDS_STA_04
:
p
=
"Non_Unique"
;
break
;
case
IDS_STA_05
:
p
=
"Index_Qualifier"
;
break
;
...
...
@@ -162,18 +162,18 @@ char *GetMsgid(int id)
case
IDS_INF_13
:
p
=
"Local_Type_Name"
;
break
;
case
IDS_INF_14
:
p
=
"Minimum_Scale"
;
break
;
case
IDS_INF_15
:
p
=
"Maximum_Scale"
;
break
;
case
IDS_PKY_01
:
p
=
"Table_
Qualifier"
;
break
;
case
IDS_PKY_02
:
p
=
"Table_
Owner"
;
break
;
case
IDS_PKY_01
:
p
=
"Table_
Catalog"
;
break
;
case
IDS_PKY_02
:
p
=
"Table_
Schema"
;
break
;
case
IDS_PKY_03
:
p
=
"Table_Name"
;
break
;
case
IDS_PKY_04
:
p
=
"Column_Name"
;
break
;
case
IDS_PKY_05
:
p
=
"Key_Seq"
;
break
;
case
IDS_PKY_06
:
p
=
"Pk_Name"
;
break
;
case
IDS_FKY_01
:
p
=
"PKTable_
Qualifier"
;
break
;
case
IDS_FKY_02
:
p
=
"PKTable_
Owner"
;
break
;
case
IDS_FKY_01
:
p
=
"PKTable_
Catalog"
;
break
;
case
IDS_FKY_02
:
p
=
"PKTable_
Schema"
;
break
;
case
IDS_FKY_03
:
p
=
"PKTable_Name"
;
break
;
case
IDS_FKY_04
:
p
=
"PKColumn_Name"
;
break
;
case
IDS_FKY_05
:
p
=
"FKTable_
Qualifier"
;
break
;
case
IDS_FKY_06
:
p
=
"FKTable_
Owner"
;
break
;
case
IDS_FKY_05
:
p
=
"FKTable_
Catalog"
;
break
;
case
IDS_FKY_06
:
p
=
"FKTable_
Schema"
;
break
;
case
IDS_FKY_07
:
p
=
"FKTable_Name"
;
break
;
case
IDS_FKY_08
:
p
=
"FKColumn_Name"
;
break
;
case
IDS_FKY_09
:
p
=
"Key_Seq"
;
break
;
...
...
@@ -181,8 +181,8 @@ char *GetMsgid(int id)
case
IDS_FKY_11
:
p
=
"Delete_Rule"
;
break
;
case
IDS_FKY_12
:
p
=
"FK_Name"
;
break
;
case
IDS_FKY_13
:
p
=
"PK_Name"
;
break
;
case
IDS_STA_01
:
p
=
"Table_
Qualifier"
;
break
;
case
IDS_STA_02
:
p
=
"Table_
Owner"
;
break
;
case
IDS_STA_01
:
p
=
"Table_
Catalog"
;
break
;
case
IDS_STA_02
:
p
=
"Table_
Schema"
;
break
;
case
IDS_STA_03
:
p
=
"Table_Name"
;
break
;
case
IDS_STA_04
:
p
=
"Non_Unique"
;
break
;
case
IDS_STA_05
:
p
=
"Index_Qualifier"
;
break
;
...
...
storage/connect/reldef.cpp
View file @
4d5f5f4c
...
...
@@ -73,7 +73,7 @@ RELDEF::RELDEF(void)
/***********************************************************************/
TABDEF
::
TABDEF
(
void
)
{
Owner
=
NULL
;
Schema
=
NULL
;
Desc
=
NULL
;
Catfunc
=
FNC_NO
;
Card
=
0
;
...
...
@@ -338,9 +338,9 @@ COLCRT::COLCRT(PSZ name)
Fmt
=
NULL
;
Offset
=
-
1
;
Long
=
-
1
;
//Freq
= -1;
Precision
=
-
1
;
Key
=
-
1
;
Prec
=
-
1
;
Scale
=
-
1
;
Opt
=
-
1
;
DataType
=
'*'
;
}
// end of COLCRT constructor for table creation
...
...
@@ -354,9 +354,9 @@ COLCRT::COLCRT(void)
Fmt
=
NULL
;
Offset
=
0
;
Long
=
0
;
//Freq
= 0;
Precision
=
0
;
Key
=
0
;
Prec
=
0
;
Scale
=
0
;
Opt
=
0
;
DataType
=
'*'
;
}
// end of COLCRT constructor for table & view definition
...
...
@@ -394,8 +394,10 @@ int COLDEF::Define(PGLOBAL g, void *memp, PCOLINFO cfp, int poff)
strcpy
(
F
.
Type
,
GetFormatType
(
Buf_Type
));
F
.
Length
=
cfp
->
Length
;
F
.
Prec
=
cfp
->
Prec
;
F
.
Prec
=
cfp
->
Scale
;
Offset
=
(
cfp
->
Offset
<
0
)
?
poff
:
cfp
->
Offset
;
Precision
=
cfp
->
Precision
;
Scale
=
cfp
->
Scale
;
Long
=
cfp
->
Length
;
Opt
=
cfp
->
Opt
;
Key
=
cfp
->
Key
;
...
...
storage/connect/reldef.h
View file @
4d5f5f4c
...
...
@@ -87,7 +87,7 @@ class DllExport TABDEF : public RELDEF { /* Logical table descriptor */
protected:
// Members
PSZ
Owner
;
/* Table owner (for ODBC)
*/
PSZ
Schema
;
/* Table schema (for ODBC)
*/
PSZ
Desc
;
/* Table description */
uint
Catfunc
;
/* Catalog function ID */
int
Card
;
/* (max) number of rows in table */
...
...
@@ -149,6 +149,7 @@ class DllExport COLCRT : public BLOCK { /* Column description block
PSZ
GetFmt
(
void
)
{
return
Fmt
;}
int
GetOpt
(
void
)
{
return
Opt
;}
int
GetLong
(
void
)
{
return
Long
;}
int
GetPrecision
(
void
)
{
return
Precision
;}
int
GetOffset
(
void
)
{
return
Offset
;}
void
SetOffset
(
int
offset
)
{
Offset
=
offset
;}
...
...
@@ -161,7 +162,8 @@ class DllExport COLCRT : public BLOCK { /* Column description block
int
Offset
;
/* Offset of field within record */
int
Long
;
/* Length of field in file record (!BIN) */
int
Key
;
/* Key (greater than 1 if multiple) */
int
Prec
;
/* Precision for float values */
int
Precision
;
/* Logical column length */
int
Scale
;
/* Decimals for float/decimal values */
int
Opt
;
/* 0:Not 1:clustered 2:sorted-asc 3:desc */
char
DataType
;
/* Internal data type (C, N, F, T) */
};
// end of COLCRT
...
...
storage/connect/tabcol.cpp
View file @
4d5f5f4c
...
...
@@ -30,7 +30,7 @@ XTAB::XTAB(LPCSTR name, LPCSTR srcdef) : Name(name)
Next
=
NULL
;
To_Tdb
=
NULL
;
Srcdef
=
srcdef
;
Creator
=
NULL
;
Schema
=
NULL
;
Qualifier
=
NULL
;
#ifdef DEBTRACE
...
...
@@ -46,7 +46,7 @@ XTAB::XTAB(PTABLE tp) : Name(tp->Name)
Next
=
NULL
;
To_Tdb
=
NULL
;
Srcdef
=
tp
->
Srcdef
;
Creator
=
tp
->
Creator
;
Schema
=
tp
->
Schema
;
Qualifier
=
tp
->
Qualifier
;
#ifdef DEBTRACE
...
...
@@ -83,7 +83,7 @@ void XTAB::Print(PGLOBAL g, FILE *f, uint n)
for
(
PTABLE
tp
=
this
;
tp
;
tp
=
tp
->
Next
)
{
fprintf
(
f
,
"%sTABLE: %s.%s %s
\n
"
,
m
,
SVP
(
tp
->
Creator
),
tp
->
Name
,
SVP
(
tp
->
Srcdef
));
m
,
SVP
(
tp
->
Schema
),
tp
->
Name
,
SVP
(
tp
->
Srcdef
));
PlugPutOut
(
g
,
f
,
TYPE_TDB
,
tp
->
To_Tdb
,
n
+
2
);
}
/* endfor tp */
...
...
@@ -101,7 +101,7 @@ void XTAB::Print(PGLOBAL g, char *ps, uint z)
for
(
PTABLE
tp
=
this
;
tp
&&
n
>
0
;
tp
=
tp
->
Next
)
{
i
=
sprintf
(
buf
,
"TABLE: %s.%s %s To_Tdb=%p "
,
SVP
(
tp
->
Creator
),
tp
->
Name
,
SVP
(
tp
->
Srcdef
),
tp
->
To_Tdb
);
SVP
(
tp
->
Schema
),
tp
->
Name
,
SVP
(
tp
->
Srcdef
),
tp
->
To_Tdb
);
strncat
(
ps
,
buf
,
n
);
n
-=
i
;
}
// endif tp
...
...
storage/connect/tabcol.h
View file @
4d5f5f4c
...
...
@@ -15,7 +15,7 @@
/***********************************************************************/
/* Definition of class XTAB with all its method functions. */
/***********************************************************************/
class
DllExport
XTAB
:
public
BLOCK
{
// Table Name-
Owner
-Srcdef block.
class
DllExport
XTAB
:
public
BLOCK
{
// Table Name-
Schema
-Srcdef block.
friend
class
TDBPRX
;
friend
class
TDBTBM
;
public:
...
...
@@ -28,12 +28,12 @@ class DllExport XTAB: public BLOCK { // Table Name-Owner-Srcdef block.
PTDB
GetTo_Tdb
(
void
)
{
return
To_Tdb
;}
LPCSTR
GetName
(
void
)
{
return
Name
;}
LPCSTR
GetSrc
(
void
)
{
return
Srcdef
;}
LPCSTR
Get
Creator
(
void
)
{
return
Creator
;}
LPCSTR
Get
Schema
(
void
)
{
return
Schema
;}
LPCSTR
GetQualifier
(
void
)
{
return
Qualifier
;}
void
SetTo_Tdb
(
PTDB
tdbp
)
{
To_Tdb
=
tdbp
;}
void
SetName
(
LPCSTR
name
)
{
Name
=
name
;}
void
SetSrc
(
LPCSTR
srcdef
)
{
Srcdef
=
srcdef
;}
void
Set
Creator
(
LPCSTR
crname
)
{
Creator
=
cr
name
;}
void
Set
Schema
(
LPCSTR
schname
)
{
Schema
=
sch
name
;}
void
SetQualifier
(
LPCSTR
qname
)
{
Qualifier
=
qname
;}
// Methods
...
...
@@ -47,7 +47,7 @@ class DllExport XTAB: public BLOCK { // Table Name-Owner-Srcdef block.
PTDB
To_Tdb
;
// Points to Table description Block
LPCSTR
Name
;
// Table name
LPCSTR
Srcdef
;
// Table Source definition
LPCSTR
Creator
;
// Creator
name
LPCSTR
Schema
;
// Schema
name
LPCSTR
Qualifier
;
// Qualifier name
};
// end of class XTAB
...
...
@@ -68,7 +68,7 @@ class DllExport COLUMN: public XOBJECT { // Column Name/Qualifier block.
virtual
int
GetResultType
(
void
)
{
assert
(
false
);
return
TYPE_VOID
;}
virtual
int
GetLength
(
void
)
{
assert
(
false
);
return
0
;}
virtual
int
GetLengthEx
(
void
)
{
assert
(
false
);
return
0
;}
virtual
int
Get
Precision
()
{
assert
(
false
);
return
0
;};
virtual
int
Get
Scale
()
{
assert
(
false
);
return
0
;};
LPCSTR
GetName
(
void
)
{
return
Name
;}
LPCSTR
GetQualifier
(
void
)
{
return
Qualifier
;}
PTABLE
GetTo_Table
(
void
)
{
return
To_Table
;}
...
...
storage/connect/tabdos.cpp
View file @
4d5f5f4c
...
...
@@ -499,7 +499,10 @@ int TDBDOS::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add)
if
(
!
(
colp
=
ColDB
(
g
,
kdp
->
GetName
(),
0
)))
{
sprintf
(
g
->
Message
,
MSG
(
INDX_COL_NOTIN
),
kdp
->
GetName
(),
Name
);
goto
err
;
}
// endif colp
}
else
if
(
colp
->
GetResultType
()
==
TYPE_DECIM
)
{
sprintf
(
g
->
Message
,
"Decimal columns are not indexable yet"
);
goto
err
;
}
// endif Type
colp
->
InitValue
(
g
);
n
=
max
(
n
,
xdp
->
GetNparts
());
...
...
@@ -944,7 +947,7 @@ DOSCOL::DOSCOL(PGLOBAL g, PCOLDEF cdp, PTDB tp, PCOL cp, int i, PSZ am)
}
// endswitch p
// Set number of decimal digits
Dcm
=
(
*
p
)
?
atoi
(
p
)
:
Get
Precision
();
Dcm
=
(
*
p
)
?
atoi
(
p
)
:
Get
Scale
();
}
// endif fmt
if
(
trace
)
...
...
@@ -1006,10 +1009,10 @@ bool DOSCOL::SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
if
(
GetDomain
()
||
((
DTVAL
*
)
value
)
->
IsFormatted
())
goto
newval
;
// This will make a new value;
}
else
if
(
Buf_Type
==
TYPE_
FLOAT
)
}
else
if
(
Buf_Type
==
TYPE_
DOUBLE
)
// Float values must be written with the correct (column) precision
// Note: maybe this should be forced by ShowValue instead of this ?
value
->
SetPrec
(
Get
Precision
());
value
->
SetPrec
(
Get
Scale
());
Value
=
value
;
// Directly access the external value
}
else
{
...
...
@@ -1094,7 +1097,7 @@ void DOSCOL::ReadColumn(PGLOBAL g)
}
// endif SetValue_char
break
;
case
TYPE_
FLOAT
:
case
TYPE_
DOUBLE
:
Value
->
SetValue_char
(
p
,
field
);
dval
=
Value
->
GetFloatValue
();
...
...
@@ -1207,7 +1210,7 @@ void DOSCOL::WriteColumn(PGLOBAL g)
len
=
sprintf
(
Buf
,
fmt
,
field
-
i
,
Value
->
GetTinyValue
());
break
;
case
TYPE_
FLOAT
:
case
TYPE_
DOUBLE
:
strcpy
(
fmt
,
(
Ldz
)
?
"%0*.*lf"
:
"%*.*lf"
);
sprintf
(
Buf
,
fmt
,
field
+
((
Nod
&&
Dcm
)
?
1
:
0
),
Dcm
,
Value
->
GetFloatValue
());
...
...
storage/connect/tabfmt.cpp
View file @
4d5f5f4c
...
...
@@ -72,7 +72,7 @@ extern "C" int trace;
/* CSVColumns: constructs the result blocks containing the description */
/* of all the columns of a CSV file that will be retrieved by #GetData.*/
/* Note: the algorithm to set the type is based on the internal values */
/* of types (TYPE_STRING < TYPE_
FLOAT < TYPE_INT) (1 < 2 < 7).
*/
/* of types (TYPE_STRING < TYPE_
DOUBLE < TYPE_INT) (1 < 2 < 7).
*/
/* If these values are changed, this will have to be revisited. */
/***********************************************************************/
PQRYRES
CSVColumns
(
PGLOBAL
g
,
const
char
*
fn
,
char
sep
,
char
q
,
...
...
@@ -230,9 +230,9 @@ PQRYRES CSVColumns(PGLOBAL g, const char *fn, char sep, char q,
if
(
n
)
{
len
[
i
]
=
max
(
len
[
i
],
n
);
type
=
(
digit
||
(
dec
&&
n
==
1
))
?
TYPE_STRING
:
(
dec
)
?
TYPE_
FLOAT
:
TYPE_INT
;
:
(
dec
)
?
TYPE_
DOUBLE
:
TYPE_INT
;
typ
[
i
]
=
min
(
type
,
typ
[
i
]);
prc
[
i
]
=
max
((
typ
[
i
]
==
TYPE_
FLOAT
)
?
(
dec
-
1
)
:
0
,
prc
[
i
]);
prc
[
i
]
=
max
((
typ
[
i
]
==
TYPE_
DOUBLE
)
?
(
dec
-
1
)
:
0
,
prc
[
i
]);
}
// endif n
i
++
;
...
...
@@ -310,9 +310,9 @@ PQRYRES CSVColumns(PGLOBAL g, const char *fn, char sep, char q,
if
(
n
)
{
len
[
i
]
=
max
(
len
[
i
],
n
);
type
=
(
digit
||
n
==
0
||
(
dec
&&
n
==
1
))
?
TYPE_STRING
:
(
dec
)
?
TYPE_
FLOAT
:
TYPE_INT
;
:
(
dec
)
?
TYPE_
DOUBLE
:
TYPE_INT
;
typ
[
i
]
=
min
(
type
,
typ
[
i
]);
prc
[
i
]
=
max
((
typ
[
i
]
==
TYPE_
FLOAT
)
?
(
dec
-
1
)
:
0
,
prc
[
i
]);
prc
[
i
]
=
max
((
typ
[
i
]
==
TYPE_
DOUBLE
)
?
(
dec
-
1
)
:
0
,
prc
[
i
]);
}
// endif n
imax
=
max
(
imax
,
i
+
1
);
...
...
storage/connect/tabmysql.cpp
View file @
4d5f5f4c
...
...
@@ -1117,7 +1117,7 @@ MYSQLCOL::MYSQLCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PSZ am)
}
// endif cprec
// Set additional MySQL access method information for column.
Long
=
cdp
->
GetLong
();
Precision
=
Long
=
cdp
->
GetLong
();
Bind
=
NULL
;
To_Val
=
NULL
;
Slen
=
0
;
...
...
@@ -1136,7 +1136,7 @@ MYSQLCOL::MYSQLCOL(MYSQL_FIELD *fld, PTDB tdbp, int i, PSZ am)
{
Name
=
fld
->
name
;
Opt
=
0
;
Long
=
fld
->
length
;
Precision
=
Long
=
fld
->
length
;
Buf_Type
=
MYSQLtoPLG
(
fld
->
type
);
strcpy
(
Format
.
Type
,
GetFormatType
(
Buf_Type
));
Format
.
Length
=
Long
;
...
...
@@ -1144,6 +1144,9 @@ MYSQLCOL::MYSQLCOL(MYSQL_FIELD *fld, PTDB tdbp, int i, PSZ am)
ColUse
=
U_P
;
Nullable
=
!
IS_NOT_NULL
(
fld
->
flags
);
if
(
Buf_Type
==
TYPE_DECIM
)
Precision
=
((
Field_new_decimal
*
)
fld
)
->
precision
;
// Set additional MySQL access method information for column.
Bind
=
NULL
;
To_Val
=
NULL
;
...
...
@@ -1202,10 +1205,10 @@ bool MYSQLCOL::SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
if
(
GetDomain
()
||
((
DTVAL
*
)
value
)
->
IsFormatted
())
goto
newval
;
// This will make a new value;
}
else
if
(
Buf_Type
==
TYPE_
FLOAT
)
}
else
if
(
Buf_Type
==
TYPE_
DOUBLE
)
// Float values must be written with the correct (column) precision
// Note: maybe this should be forced by ShowValue instead of this ?
value
->
SetPrec
(
Get
Precision
());
value
->
SetPrec
(
Get
Scale
());
Value
=
value
;
// Directly access the external value
}
else
{
...
...
storage/connect/tabodbc.cpp
View file @
4d5f5f4c
...
...
@@ -90,7 +90,7 @@ extern int num_read, num_there, num_eq[2]; // Statistics
/***********************************************************************/
ODBCDEF
::
ODBCDEF
(
void
)
{
Connect
=
Tabname
=
Tabowner
=
Tabqual
=
Srcdef
=
Qchar
=
Qrystr
=
NULL
;
Connect
=
Tabname
=
Tabschema
=
Tabcat
=
Srcdef
=
Qchar
=
Qrystr
=
Sep
=
NULL
;
Catver
=
Options
=
Quoted
=
Maxerr
=
Maxres
=
0
;
Xsrc
=
false
;
}
// end of ODBCDEF constructor
...
...
@@ -104,11 +104,13 @@ bool ODBCDEF::DefineAM(PGLOBAL g, LPCSTR am, int poff)
Tabname
=
Cat
->
GetStringCatInfo
(
g
,
"Name"
,
(
Catfunc
&
(
FNC_TABLE
|
FNC_COL
))
?
NULL
:
Name
);
Tabname
=
Cat
->
GetStringCatInfo
(
g
,
"Tabname"
,
Tabname
);
//Tabowner = Cat->GetStringCatInfo(g, "Owner", NULL);
Tabowner
=
Cat
->
GetStringCatInfo
(
g
,
"Dbname"
,
NULL
);
Tabqual
=
Cat
->
GetStringCatInfo
(
g
,
"Qualifier"
,
NULL
);
Tabschema
=
Cat
->
GetStringCatInfo
(
g
,
"Dbname"
,
NULL
);
Tabschema
=
Cat
->
GetStringCatInfo
(
g
,
"Schema"
,
Tabschema
);
Tabcat
=
Cat
->
GetStringCatInfo
(
g
,
"Qualifier"
,
NULL
);
Tabcat
=
Cat
->
GetStringCatInfo
(
g
,
"Catalog"
,
Tabcat
);
Srcdef
=
Cat
->
GetStringCatInfo
(
g
,
"Srcdef"
,
NULL
);
Qrystr
=
Cat
->
GetStringCatInfo
(
g
,
"Query_String"
,
"?"
);
Sep
=
Cat
->
GetStringCatInfo
(
g
,
"Separator"
,
NULL
);
Catver
=
Cat
->
GetIntCatInfo
(
"Catver"
,
2
);
Xsrc
=
Cat
->
GetBoolCatInfo
(
"Execsrc"
,
FALSE
);
Maxerr
=
Cat
->
GetIntCatInfo
(
"Maxerr"
,
0
);
...
...
@@ -170,10 +172,11 @@ TDBODBC::TDBODBC(PODEF tdp) : TDBASE(tdp)
if
(
tdp
)
{
Connect
=
tdp
->
Connect
;
TableName
=
tdp
->
Tabname
;
Owner
=
tdp
->
Tabowner
;
Qualifier
=
tdp
->
Tabqual
;
Schema
=
tdp
->
Tabschema
;
Catalog
=
tdp
->
Tabcat
;
Srcdef
=
tdp
->
Srcdef
;
Qrystr
=
tdp
->
Qrystr
;
Sep
=
tdp
->
GetSep
();
Options
=
tdp
->
Options
;
Quoted
=
max
(
0
,
tdp
->
GetQuoted
());
Rows
=
tdp
->
GetElemt
();
...
...
@@ -181,10 +184,11 @@ TDBODBC::TDBODBC(PODEF tdp) : TDBASE(tdp)
}
else
{
Connect
=
NULL
;
TableName
=
NULL
;
Owner
=
NULL
;
Qualifier
=
NULL
;
Schema
=
NULL
;
Catalog
=
NULL
;
Srcdef
=
NULL
;
Qrystr
=
NULL
;
Sep
=
0
;
Options
=
0
;
Quoted
=
0
;
Rows
=
0
;
...
...
@@ -211,8 +215,8 @@ TDBODBC::TDBODBC(PTDBODBC tdbp) : TDBASE(tdbp)
Cnp
=
tdbp
->
Cnp
;
Connect
=
tdbp
->
Connect
;
TableName
=
tdbp
->
TableName
;
Owner
=
tdbp
->
Owner
;
Qualifier
=
tdbp
->
Qualifier
;
Schema
=
tdbp
->
Schema
;
Catalog
=
tdbp
->
Catalog
;
Srcdef
=
tdbp
->
Srcdef
;
Qrystr
=
tdbp
->
Qrystr
;
Quote
=
tdbp
->
Quote
;
...
...
@@ -336,7 +340,7 @@ int TDBODBC::Decode(char *txt, char *buf, size_t n)
char
*
TDBODBC
::
MakeSQL
(
PGLOBAL
g
,
bool
cnt
)
{
char
*
colist
,
*
tabname
,
*
sql
,
buf
[
64
];
LPCSTR
ownp
=
NULL
,
qual
p
=
NULL
;
LPCSTR
schmp
=
NULL
,
cat
p
=
NULL
;
int
len
,
ncol
=
0
;
bool
first
=
true
;
PTABLE
tablep
=
To_Table
;
...
...
@@ -406,37 +410,34 @@ char *TDBODBC::MakeSQL(PGLOBAL g, bool cnt)
len
=
(
strlen
(
colist
)
+
strlen
(
buf
)
+
14
);
len
+=
(
To_Filter
?
strlen
(
To_Filter
->
Body
)
+
7
:
0
);
// if (tablep->GetQualifier()) This is used when using a table
// qualp = tablep->GetQualifier(); from anotherPlugDB database but
// else makes no sense for ODBC.
if
(
Qualifier
&&
*
Qualifier
)
qualp
=
Qualifier
;
if
(
Catalog
&&
*
Catalog
)
catp
=
Catalog
;
if
(
qual
p
)
len
+=
(
strlen
(
qual
p
)
+
2
);
if
(
cat
p
)
len
+=
(
strlen
(
cat
p
)
+
2
);
if
(
tablep
->
Get
Creator
())
ownp
=
tablep
->
GetCreator
();
else
if
(
Owner
&&
*
Owner
)
ownp
=
Owner
;
if
(
tablep
->
Get
Schema
())
schmp
=
tablep
->
GetSchema
();
else
if
(
Schema
&&
*
Schema
)
schmp
=
Schema
;
if
(
own
p
)
len
+=
(
strlen
(
own
p
)
+
1
);
if
(
schm
p
)
len
+=
(
strlen
(
schm
p
)
+
1
);
sql
=
(
char
*
)
PlugSubAlloc
(
g
,
NULL
,
len
);
strcat
(
strcat
(
strcpy
(
sql
,
"SELECT "
),
colist
),
" FROM "
);
if
(
qual
p
)
{
strcat
(
sql
,
qual
p
);
if
(
cat
p
)
{
strcat
(
sql
,
cat
p
);
if
(
own
p
)
strcat
(
strcat
(
sql
,
"."
),
own
p
);
if
(
schm
p
)
strcat
(
strcat
(
sql
,
"."
),
schm
p
);
else
strcat
(
sql
,
"."
);
strcat
(
sql
,
"."
);
}
else
if
(
own
p
)
strcat
(
strcat
(
sql
,
own
p
),
"."
);
}
else
if
(
schm
p
)
strcat
(
strcat
(
sql
,
schm
p
),
"."
);
strcat
(
sql
,
tabname
);
...
...
@@ -921,7 +922,8 @@ ODBCCOL::ODBCCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PSZ am)
}
// endif cprec
// Set additional ODBC access method information for column.
Long
=
cdp
->
GetLong
();
//Long = cdp->GetLong();
Long
=
Precision
;
//strcpy(F_Date, cdp->F_Date);
To_Val
=
NULL
;
Slen
=
0
;
...
...
@@ -986,10 +988,10 @@ bool ODBCCOL::SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
if
(
GetDomain
()
||
((
DTVAL
*
)
value
)
->
IsFormatted
())
goto
newval
;
// This will make a new value;
}
else
if
(
Buf_Type
==
TYPE_
FLOAT
)
}
else
if
(
Buf_Type
==
TYPE_
DOUBLE
)
// Float values must be written with the correct (column) precision
// Note: maybe this should be forced by ShowValue instead of this ?
value
->
SetPrec
(
Get
Precision
());
value
->
SetPrec
(
Get
Scale
());
Value
=
value
;
// Directly access the external value
}
else
{
...
...
@@ -1036,12 +1038,14 @@ void ODBCCOL::ReadColumn(PGLOBAL g)
}
else
Value
->
SetNull
(
false
);
if
(
Bufp
&&
tdbp
->
Rows
)
if
(
Bufp
&&
tdbp
->
Rows
)
{
if
(
Buf_Type
==
TYPE_DATE
)
*
Sqlbuf
=
((
TIMESTAMP_STRUCT
*
)
Bufp
)[
n
];
else
Value
->
SetValue_pvblk
(
Blkp
,
n
);
}
// endif Bufp
if
(
Buf_Type
==
TYPE_DATE
)
{
struct
tm
dbtime
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
...
...
@@ -1052,7 +1056,14 @@ void ODBCCOL::ReadColumn(PGLOBAL g)
dbtime
.
tm_mon
=
(
int
)
Sqlbuf
->
month
-
1
;
dbtime
.
tm_year
=
(
int
)
Sqlbuf
->
year
-
1900
;
((
DTVAL
*
)
Value
)
->
MakeTime
(
&
dbtime
);
}
// endif Buf_Type
}
else
if
(
Buf_Type
==
TYPE_DECIM
&&
tdbp
->
Sep
)
{
// Be sure to use decimal point
char
*
p
=
strchr
(
Value
->
GetCharValue
(),
tdbp
->
Sep
);
if
(
p
)
*
p
=
'.'
;
}
// endif Buf_Type
if
(
g
->
Trace
)
{
char
buf
[
32
];
...
...
@@ -1080,7 +1091,8 @@ void ODBCCOL::AllocateBuffers(PGLOBAL g, int rows)
if
(
Buf_Type
==
TYPE_DATE
)
Bufp
=
PlugSubAlloc
(
g
,
NULL
,
rows
*
sizeof
(
TIMESTAMP_STRUCT
));
else
{
Blkp
=
AllocValBlock
(
g
,
NULL
,
Buf_Type
,
rows
,
Long
+
1
,
0
,
true
,
false
,
false
);
Blkp
=
AllocValBlock
(
g
,
NULL
,
Buf_Type
,
rows
,
GetBuflen
(),
GetScale
(),
true
,
false
,
false
);
Bufp
=
Blkp
->
GetValPointer
();
}
// endelse
...
...
@@ -1107,13 +1119,21 @@ void *ODBCCOL::GetBuffer(DWORD rows)
/***********************************************************************/
SWORD
ODBCCOL
::
GetBuflen
(
void
)
{
if
(
Buf_Type
==
TYPE_DATE
)
return
(
SWORD
)
sizeof
(
TIMESTAMP_STRUCT
);
else
if
(
Buf_Type
==
TYPE_STRING
)
return
(
SWORD
)
Value
->
GetClen
()
+
1
;
else
return
(
SWORD
)
Value
->
GetClen
();
SWORD
flen
;
switch
(
Buf_Type
)
{
case
TYPE_DATE
:
flen
=
(
SWORD
)
sizeof
(
TIMESTAMP_STRUCT
);
break
;
case
TYPE_STRING
:
case
TYPE_DECIM
:
flen
=
(
SWORD
)
Value
->
GetClen
()
+
1
;
break
;
default:
flen
=
(
SWORD
)
Value
->
GetClen
();
}
// endswitch Buf_Type
return
flen
;
}
// end of GetBuflen
/***********************************************************************/
...
...
@@ -1137,11 +1157,18 @@ void ODBCCOL::WriteColumn(PGLOBAL g)
Sqlbuf
->
month
=
dbtime
->
tm_mon
+
1
;
Sqlbuf
->
year
=
dbtime
->
tm_year
+
1900
;
Sqlbuf
->
fraction
=
0
;
}
// endif Buf_Type
}
else
if
(
Buf_Type
==
TYPE_DECIM
)
{
// Some data sources require local decimal separator
char
*
p
,
sep
=
((
PTDBODBC
)
To_Tdb
)
->
Sep
;
if
(
sep
&&
(
p
=
strchr
(
Value
->
GetCharValue
(),
'.'
)))
*
p
=
sep
;
}
// endif Buf_Type
if
(
Nullable
)
*
StrLen
=
(
Value
->
IsNull
())
?
SQL_NULL_DATA
:
(
IsTypeNum
(
Buf_Type
))
?
0
:
SQL_NTS
;
(
IsTypeChar
(
Buf_Type
))
?
SQL_NTS
:
0
;
}
// end of WriteColumn
...
...
@@ -1415,7 +1442,7 @@ PQRYRES TDBSRC::GetResult(PGLOBAL g)
TDBOTB
::
TDBOTB
(
PODEF
tdp
)
:
TDBDRV
(
tdp
)
{
Dsn
=
tdp
->
GetConnect
();
Schema
=
tdp
->
GetTab
owner
();
Schema
=
tdp
->
GetTab
schema
();
Tab
=
tdp
->
GetTabname
();
}
// end of TDBOTB constructor
...
...
storage/connect/tabodbc.h
View file @
4d5f5f4c
...
...
@@ -32,9 +32,10 @@ class DllExport ODBCDEF : public TABDEF { /* Logical table description */
virtual
const
char
*
GetType
(
void
)
{
return
"ODBC"
;}
PSZ
GetConnect
(
void
)
{
return
Connect
;}
PSZ
GetTabname
(
void
)
{
return
Tabname
;}
PSZ
GetTab
owner
(
void
)
{
return
Tabowner
;}
PSZ
GetTab
qual
(
void
)
{
return
Tabqual
;}
PSZ
GetTab
schema
(
void
)
{
return
Tabschema
;}
PSZ
GetTab
cat
(
void
)
{
return
Tabcat
;}
PSZ
GetSrcdef
(
void
)
{
return
Srcdef
;}
char
GetSep
(
void
)
{
return
(
Sep
)
?
*
Sep
:
0
;}
int
GetQuoted
(
void
)
{
return
Quoted
;}
int
GetCatver
(
void
)
{
return
Catver
;}
int
GetOptions
(
void
)
{
return
Options
;}
...
...
@@ -47,11 +48,12 @@ class DllExport ODBCDEF : public TABDEF { /* Logical table description */
// Members
PSZ
Connect
;
/* ODBC connection string */
PSZ
Tabname
;
/* External table name */
PSZ
Tab
owner
;
/* External table owner
*/
PSZ
Tab
qual
;
/* External table qualifier
*/
PSZ
Tab
schema
;
/* External table schema
*/
PSZ
Tab
cat
;
/* External table catalog
*/
PSZ
Srcdef
;
/* The source table SQL definition */
PSZ
Qchar
;
/* Identifier quoting character */
PSZ
Qrystr
;
/* The original query */
PSZ
Sep
;
/* Decimal separator */
int
Catver
;
/* ODBC version for catalog functions */
int
Options
;
/* Open connection options */
int
Quoted
;
/* Identifier quoting level */
...
...
@@ -115,8 +117,8 @@ class TDBODBC : public TDBASE {
ODBCCOL
*
Cnp
;
// Points to count(*) column
char
*
Connect
;
// Points to connection string
char
*
TableName
;
// Points to ODBC table name
char
*
Owner
;
// Points to ODBC table Owner
char
*
Qualifier
;
// Points to ODBC table Qualifier
char
*
Schema
;
// Points to ODBC table Schema
char
*
Catalog
;
// Points to ODBC table Catalog
char
*
Srcdef
;
// The source table SQL definition
char
*
Query
;
// Points to SQL statement
char
*
Count
;
// Points to count(*) SQL statement
...
...
@@ -125,6 +127,7 @@ class TDBODBC : public TDBASE {
char
*
MulConn
;
// Used for multiple ODBC tables
char
*
DBQ
;
// The address part of Connect string
char
*
Qrystr
;
// The original query
char
Sep
;
// The decimal separator
int
Options
;
// Connect options
int
Quoted
;
// The identifier quoting level
int
Fpos
;
// Position of last read record
...
...
storage/connect/tabsys.cpp
View file @
4d5f5f4c
...
...
@@ -416,10 +416,10 @@ bool INICOL::SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
if
(
GetDomain
()
||
((
DTVAL
*
)
value
)
->
IsFormatted
())
goto
newval
;
// This will make a new value;
}
else
if
(
Buf_Type
==
TYPE_
FLOAT
)
}
else
if
(
Buf_Type
==
TYPE_
DOUBLE
||
Buf_Type
==
TYPE_DECIM
)
// Float values must be written with the correct (column) precision
// Note: maybe this should be forced by ShowValue instead of this ?
value
->
SetPrec
(
Get
Precision
());
value
->
SetPrec
(
Get
Scale
());
Value
=
value
;
// Directly access the external value
}
else
{
...
...
storage/connect/tabutil.cpp
View file @
4d5f5f4c
...
...
@@ -122,16 +122,16 @@ TABLE_SHARE *GetTableShare(PGLOBAL g, THD *thd, const char *db,
PQRYRES
TabColumns
(
PGLOBAL
g
,
THD
*
thd
,
const
char
*
db
,
const
char
*
name
,
bool
&
info
)
{
static
int
buftyp
[]
=
{
TYPE_STRING
,
TYPE_SHORT
,
TYPE_STRING
,
TYPE_INT
,
TYPE_INT
,
TYPE_SHORT
,
TYPE_SHORT
,
TYPE_SHORT
,
TYPE_STRING
,
TYPE_STRING
,
TYPE_STRING
};
static
XFLD
fldtyp
[]
=
{
FLD_NAME
,
FLD_TYPE
,
FLD_TYPENAME
,
FLD_PREC
,
FLD_LENGTH
,
FLD_SCALE
,
FLD_RADIX
,
FLD_NULL
,
FLD_REM
,
FLD_NO
,
FLD_CHARSET
};
static
unsigned
int
length
[]
=
{
0
,
4
,
16
,
4
,
4
,
4
,
4
,
4
,
0
,
32
,
32
};
int
buftyp
[]
=
{
TYPE_STRING
,
TYPE_SHORT
,
TYPE_STRING
,
TYPE_INT
,
TYPE_INT
,
TYPE_SHORT
,
TYPE_SHORT
,
TYPE_SHORT
,
TYPE_STRING
,
TYPE_STRING
,
TYPE_STRING
};
XFLD
fldtyp
[]
=
{
FLD_NAME
,
FLD_TYPE
,
FLD_TYPENAME
,
FLD_PREC
,
FLD_LENGTH
,
FLD_SCALE
,
FLD_RADIX
,
FLD_NULL
,
FLD_REM
,
FLD_NO
,
FLD_CHARSET
};
unsigned
int
length
[]
=
{
0
,
4
,
16
,
4
,
4
,
4
,
4
,
4
,
0
,
32
,
32
};
char
*
fld
,
*
fmt
,
v
;
int
i
,
n
,
ncol
=
sizeof
(
buftyp
)
/
sizeof
(
int
);
int
len
,
type
,
prec
;
int
prec
,
len
,
type
,
scale
;
bool
mysql
;
TABLE_SHARE
*
s
=
NULL
;
Field
*
*
field
;
...
...
@@ -208,27 +208,33 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
// When creating tables we do need info about date columns
if
(
mysql
)
{
fmt
=
MyDateFmt
(
fp
->
type
());
len
=
strlen
(
fmt
);
prec
=
len
=
strlen
(
fmt
);
}
else
{
fmt
=
(
char
*
)
fp
->
option_struct
->
dateformat
;
len
=
fp
->
field_length
;
prec
=
len
=
fp
->
field_length
;
}
// endif mysql
}
else
{
fmt
=
NULL
;
if
(
type
==
TYPE_DECIM
)
prec
=
((
Field_new_decimal
*
)
fp
)
->
precision
;
else
prec
=
fp
->
field_length
;
// prec = (prec(???) == NOT_FIXED_DEC) ? 0 : fp->field_length;
len
=
fp
->
char_length
();
fmt
=
NULL
;
}
// endif type
crp
=
crp
->
Next
;
// Precision
crp
->
Kdata
->
SetValue
(
len
,
i
);
crp
->
Kdata
->
SetValue
(
prec
,
i
);
crp
=
crp
->
Next
;
// Length
prec
=
(
type
==
TYPE_FLOAT
)
?
fp
->
decimals
()
:
0
;
len
=
(
prec
==
31
)
?
0
:
fp
->
field_length
;
crp
->
Kdata
->
SetValue
(
len
,
i
);
crp
=
crp
->
Next
;
// Scale
crp
->
Kdata
->
SetValue
(
prec
,
i
);
scale
=
(
type
==
TYPE_DOUBLE
||
type
==
TYPE_DECIM
)
?
fp
->
decimals
()
:
0
;
crp
->
Kdata
->
SetValue
(
scale
,
i
);
crp
=
crp
->
Next
;
// Radix
crp
->
Kdata
->
SetValue
(
0
,
i
);
...
...
storage/connect/tabwmi.cpp
View file @
4d5f5f4c
...
...
@@ -269,7 +269,7 @@ PQRYRES WMIColumns(PGLOBAL g, char *nsp, char *cls, bool info)
case
CIM_REAL64
:
case
CIM_REAL32
:
prec
=
2
;
typ
=
TYPE_
FLOAT
;
typ
=
TYPE_
DOUBLE
;
lng
=
15
;
break
;
case
CIM_SINT64
:
...
...
storage/connect/tabxml.cpp
View file @
4d5f5f4c
...
...
@@ -1168,10 +1168,10 @@ bool XMLCOL::SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check)
if
(
GetDomain
()
||
((
DTVAL
*
)
value
)
->
IsFormatted
())
goto
newval
;
// This will make a new value;
}
else
if
(
Buf_Type
==
TYPE_
FLOAT
)
}
else
if
(
Buf_Type
==
TYPE_
DOUBLE
)
// Float values must be written with the correct (column) precision
// Note: maybe this should be forced by ShowValue instead of this ?
value
->
SetPrec
(
Get
Precision
());
value
->
SetPrec
(
Get
Scale
());
Value
=
value
;
// Directly access the external value
}
else
{
...
...
storage/connect/user_connect.h
View file @
4d5f5f4c
...
...
@@ -62,10 +62,10 @@ public:
static
PCONNECT
to_users
;
// To the chain of users
PCONNECT
next
;
// Next user in chain
PCONNECT
previous
;
// Previous user in chain
PGLOBAL
g
;
// The common handle to CONNECT
PGLOBAL
g
;
// The common handle to CONNECT
//char dbname[32]; // The DBCONNECT database
query_id_t
last_query_id
;
// the latest user query id
int
count
;
// if used by several handlers
int
count
;
// if used by several handlers
// Statistics
ulong
nrd
,
fnd
,
nfd
;
ulonglong
tb1
;
...
...
storage/connect/valblk.cpp
View file @
4d5f5f4c
...
...
@@ -57,6 +57,7 @@ PVBLK AllocValBlock(PGLOBAL g, void *mp, int type, int nval, int len,
switch
(
type
)
{
case
TYPE_STRING
:
case
TYPE_DECIM
:
if
(
len
)
blkp
=
new
(
g
)
CHRBLK
(
mp
,
nval
,
len
,
prec
,
blank
);
else
...
...
@@ -87,7 +88,7 @@ PVBLK AllocValBlock(PGLOBAL g, void *mp, int type, int nval, int len,
blkp
=
new
(
g
)
TYPBLK
<
longlong
>
(
mp
,
nval
,
type
);
break
;
case
TYPE_
FLOAT
:
case
TYPE_
DOUBLE
:
blkp
=
new
(
g
)
TYPBLK
<
double
>
(
mp
,
nval
,
type
,
prec
);
break
;
case
TYPE_TINY
:
...
...
@@ -343,6 +344,21 @@ ulonglong TYPBLK<longlong>::MaxVal(void) {return INT_MAX64;}
template
<
>
ulonglong
TYPBLK
<
ulonglong
>::
MaxVal
(
void
)
{
return
ULONGLONG_MAX
;}
template
<
>
void
TYPBLK
<
double
>::
SetValue
(
PSZ
p
,
int
n
)
{
ChkIndx
(
n
);
if
(
Check
)
{
PGLOBAL
&
g
=
Global
;
strcpy
(
g
->
Message
,
MSG
(
BAD_SET_STRING
));
longjmp
(
g
->
jumper
[
g
->
jump_level
],
Type
);
}
// endif Check
Typp
[
n
]
=
atof
(
p
);
SetNull
(
n
,
false
);
}
// end of SetValue
/***********************************************************************/
/* Set one value in a block from an array of characters. */
/***********************************************************************/
...
...
@@ -1163,7 +1179,7 @@ DATBLK::DATBLK(void *mp, int nval) : TYPBLK<int>(mp, nval, TYPE_INT)
/***********************************************************************/
bool
DATBLK
::
SetFormat
(
PGLOBAL
g
,
PSZ
fmt
,
int
len
,
int
year
)
{
if
(
!
(
Dvalp
=
AllocateValue
(
g
,
TYPE_DATE
,
len
,
year
,
fmt
)))
if
(
!
(
Dvalp
=
AllocateValue
(
g
,
TYPE_DATE
,
len
,
year
,
f
alse
,
f
mt
)))
return
true
;
return
false
;
...
...
storage/connect/value.cpp
View file @
4d5f5f4c
This diff is collapsed.
Click to expand it.
storage/connect/value.h
View file @
4d5f5f4c
...
...
@@ -47,9 +47,9 @@ DllExport int GetFormatType(char);
DllExport
bool
IsTypeChar
(
int
type
);
DllExport
bool
IsTypeNum
(
int
type
);
//lExport int ConvertType(int, int, CONV, bool match = false);
Dl
lExport
PVAL
AllocateValue
(
PGLOBAL
,
PVAL
,
int
=
TYPE_VOID
,
int
=
0
);
//
lExport PVAL AllocateValue(PGLOBAL, PVAL, int = TYPE_VOID, int = 0);
DllExport
PVAL
AllocateValue
(
PGLOBAL
,
int
,
int
len
=
0
,
int
prec
=
0
,
PSZ
fmt
=
NULL
);
bool
uns
=
false
,
PSZ
fmt
=
NULL
);
DllExport
ulonglong
CharToNumber
(
char
*
,
int
,
ulonglong
,
bool
,
bool
*
minus
=
NULL
,
bool
*
rc
=
NULL
);
...
...
@@ -255,6 +255,37 @@ class DllExport TYPVAL<PSZ>: public VALUE {
int
Len
;
};
// end of class TYPVAL<PSZ>
/***********************************************************************/
/* Specific DECIMAL class. */
/***********************************************************************/
class
DllExport
DECVAL
:
public
TYPVAL
<
PSZ
>
{
public:
// Constructors
DECVAL
(
PSZ
s
);
DECVAL
(
PGLOBAL
g
,
PSZ
s
,
int
n
,
int
prec
,
bool
uns
);
// Implementation
virtual
bool
IsTypeNum
(
void
)
{
return
true
;}
virtual
bool
IsZero
(
void
);
virtual
void
Reset
(
void
);
virtual
int
GetValPrec
()
{
return
Prec
;}
// Methods
//virtual bool SetValue_pval(PVAL valp, bool chktype);
//virtual bool SetValue_char(char *p, int n);
//virtual void SetValue_psz(PSZ s);
//virtual void SetValue_pvblk(PVBLK blk, int n);
//virtual void SetBinValue(void *p);
virtual
bool
GetBinValue
(
void
*
buf
,
int
buflen
,
bool
go
);
virtual
char
*
ShowValue
(
char
*
buf
,
int
);
//virtual char *GetCharString(char *p);
virtual
bool
IsEqual
(
PVAL
vp
,
bool
chktype
);
//virtual bool FormatValue(PVAL vp, char *fmt);
//virtual bool SetConstFormat(PGLOBAL, FORMAT&);
// Members
};
// end of class DECVAL
/***********************************************************************/
/* Class DTVAL: represents a time stamp value. */
/***********************************************************************/
...
...
storage/connect/xindex.cpp
View file @
4d5f5f4c
...
...
@@ -2753,7 +2753,7 @@ KXYCOL::KXYCOL(PKXBASE kp) : To_Keys(Keys.Memp),
/***********************************************************************/
bool
KXYCOL
::
Init
(
PGLOBAL
g
,
PCOL
colp
,
int
n
,
bool
sm
,
int
kln
)
{
int
len
=
colp
->
GetLength
(),
prec
=
colp
->
Get
Precision
();
int
len
=
colp
->
GetLength
(),
prec
=
colp
->
Get
Scale
();
// Currently no indexing on NULL columns
if
(
colp
->
IsNullable
())
{
...
...
@@ -2774,7 +2774,8 @@ bool KXYCOL::Init(PGLOBAL g, PCOL colp, int n, bool sm, int kln)
// Allocate the Value object used when moving items
Type
=
colp
->
GetResultType
();
if
(
!
(
Valp
=
AllocateValue
(
g
,
Type
,
len
,
colp
->
GetPrecision
())))
if
(
!
(
Valp
=
AllocateValue
(
g
,
Type
,
len
,
colp
->
GetScale
(),
colp
->
IsUnsigned
())))
return
true
;
Klen
=
Valp
->
GetClen
();
...
...
@@ -2825,7 +2826,7 @@ BYTE* KXYCOL::MapInit(PGLOBAL g, PCOL colp, int *n, BYTE *m)
#endif
// Allocate the Value object used when moving items
Valp
=
AllocateValue
(
g
,
Type
,
len
,
prec
,
NULL
);
Valp
=
AllocateValue
(
g
,
Type
,
len
,
prec
,
false
,
NULL
);
Klen
=
Valp
->
GetClen
();
if
(
n
[
2
])
{
...
...
storage/connect/xobject.cpp
View file @
4d5f5f4c
...
...
@@ -109,6 +109,7 @@ int CONSTANT::GetLengthEx(void)
return
Value
->
GetValLen
();
}
// end of GetLengthEx
#if 0
/***********************************************************************/
/* Convert a constant to the given type. */
/***********************************************************************/
...
...
@@ -119,6 +120,7 @@ void CONSTANT::Convert(PGLOBAL g, int newtype)
longjmp(g->jumper[g->jump_level], TYPE_CONST);
} // end of Convert
#endif // 0
/***********************************************************************/
/* Compare: returns true if this object is equivalent to xp. */
...
...
@@ -151,7 +153,7 @@ bool CONSTANT::Rephrase(PGLOBAL g, PSZ work)
case TYPE_DATE:
sprintf(work + strlen(work), "%d", Value->GetIntValue());
break;
case TYPE_
FLOAT
:
case TYPE_
DOUBLE
:
sprintf(work + strlen(work), "%lf", Value->GetFloatValue());
break;
case TYPE_BIGINT:
...
...
storage/connect/xobject.h
View file @
4d5f5f4c
...
...
@@ -52,7 +52,7 @@ class DllExport XOBJECT : public BLOCK {
virtual
short
GetShortValue
(
void
);
virtual
int
GetIntValue
(
void
);
virtual
double
GetFloatValue
(
void
);
virtual
int
Get
Precision
(
void
)
=
0
;
virtual
int
Get
Scale
(
void
)
=
0
;
// Methods
virtual
void
Reset
(
void
)
{}
...
...
@@ -92,7 +92,7 @@ class DllExport XVOID : public XOBJECT {
virtual
PSZ
GetCharValue
(
void
)
{
return
NULL
;}
virtual
int
GetIntValue
(
void
)
{
return
0
;}
virtual
double
GetFloatValue
(
void
)
{
return
0.0
;}
virtual
int
Get
Precision
()
{
return
0
;}
virtual
int
Get
Scale
()
{
return
0
;}
// Methods
virtual
bool
Compare
(
PXOB
xp
)
{
return
xp
->
GetType
()
==
TYPE_VOID
;}
...
...
@@ -115,7 +115,7 @@ class DllExport CONSTANT : public XOBJECT {
virtual
int
GetType
(
void
)
{
return
TYPE_CONST
;}
virtual
int
GetResultType
(
void
)
{
return
Value
->
Type
;}
virtual
int
GetLength
(
void
)
{
return
Value
->
GetValLen
();}
virtual
int
Get
Precision
()
{
return
Value
->
GetValPrec
();}
virtual
int
Get
Scale
()
{
return
Value
->
GetValPrec
();}
virtual
int
GetLengthEx
(
void
);
// Methods
...
...
@@ -123,7 +123,7 @@ class DllExport CONSTANT : public XOBJECT {
virtual
bool
SetFormat
(
PGLOBAL
g
,
FORMAT
&
fmt
)
{
return
Value
->
SetConstFormat
(
g
,
fmt
);}
virtual
int
CheckSpcCol
(
PTDB
,
int
)
{
return
1
;}
void
Convert
(
PGLOBAL
g
,
int
newtype
);
//
void Convert(PGLOBAL g, int newtype);
// bool Rephrase(PGLOBAL g, PSZ work);
void
SetValue
(
PVAL
vp
)
{
Value
=
vp
;}
virtual
bool
VerifyColumn
(
PTBX
txp
)
{
return
true
;}
...
...
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