Skip to content

P
Postgres FD Implementation
Commit effa4028 authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

Remove HAVE_LONG_LONG_INT 

The presence of long long int is now implied in the requirement for
C99 and the configure check for the same.

We keep the define hard-coded in ecpg_config.h for backward
compatibility with ecpg-using user code.

Discussion: https://www.postgresql.org/message-id/flat/5cdd6a2b-b2c7-c6f6-344c-a406d5c1a254%402ndquadrant.com
parent 581a5588
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 296 additions and 483 deletions
configure
View file @ effa4028
...@@ -14170,123 +14170,6 @@ fi ...@@ -14170,123 +14170,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
$as_echo_n "checking for unsigned long long int... " >&6; }
if ${ac_cv_type_unsigned_long_long_int+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_type_unsigned_long_long_int=yes
if test "x${ac_cv_prog_cc_c99-no}" = xno; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* For now, do not test the preprocessor; as of 2007 there are too many
implementations with broken preprocessors. Perhaps this can
be revisited in 2012. In the meantime, code should not expect
#if to work with literals wider than 32 bits. */
/* Test literals. */
long long int ll = 9223372036854775807ll;
long long int nll = -9223372036854775807LL;
unsigned long long int ull = 18446744073709551615ULL;
/* Test constant expressions. */
typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)
? 1 : -1)];
typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1
? 1 : -1)];
int i = 63;
int
main ()
{
/* Test availability of runtime routines for shift and division. */
long long int llmax = 9223372036854775807ll;
unsigned long long int ullmax = 18446744073709551615ull;
return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
| (llmax / ll) | (llmax % ll)
| (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)
| (ullmax / ull) | (ullmax % ull));
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
else
ac_cv_type_unsigned_long_long_int=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5
$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; }
if test $ac_cv_type_unsigned_long_long_int = yes; then
$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
$as_echo_n "checking for long long int... " >&6; }
if ${ac_cv_type_long_long_int+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_cv_type_long_long_int=yes
if test "x${ac_cv_prog_cc_c99-no}" = xno; then
ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int
if test $ac_cv_type_long_long_int = yes; then
if test "$cross_compiling" = yes; then :
:
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <limits.h>
#ifndef LLONG_MAX
# define HALF \
(1LL << (sizeof (long long int) * CHAR_BIT - 2))
# define LLONG_MAX (HALF - 1 + HALF)
#endif
int
main ()
{
long long int n = 1;
int i;
for (i = 0; ; i++)
{
long long int m = n << i;
if (m >> i != n)
return 1;
if (LLONG_MAX / 2 < m)
break;
}
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
else
ac_cv_type_long_long_int=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5
$as_echo "$ac_cv_type_long_long_int" >&6; }
if test $ac_cv_type_long_long_int = yes; then
$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale_t" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for locale_t" >&5
$as_echo_n "checking for locale_t... " >&6; } $as_echo_n "checking for locale_t... " >&6; }
if ${pgac_cv_type_locale_t+:} false; then : if ${pgac_cv_type_locale_t+:} false; then :
......
configure.in
View file @ effa4028
...@@ -1473,7 +1473,6 @@ PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS ...@@ -1473,7 +1473,6 @@ PGAC_STRUCT_SOCKADDR_STORAGE_MEMBERS
PGAC_STRUCT_ADDRINFO PGAC_STRUCT_ADDRINFO
AC_TYPE_INTPTR_T AC_TYPE_INTPTR_T
AC_TYPE_UINTPTR_T AC_TYPE_UINTPTR_T
AC_TYPE_LONG_LONG_INT
PGAC_TYPE_LOCALE_T PGAC_TYPE_LOCALE_T
......
src/include/c.h
View file @ effa4028
...@@ -1203,7 +1203,6 @@ typedef union PGAlignedXLogBlock ...@@ -1203,7 +1203,6 @@ typedef union PGAlignedXLogBlock
extern int fdatasync(int fildes); extern int fdatasync(int fildes);
#endif #endif
#ifdef HAVE_LONG_LONG_INT
/* Older platforms may provide strto[u]ll functionality under other names */ /* Older platforms may provide strto[u]ll functionality under other names */
#if !defined(HAVE_STRTOLL) && defined(HAVE___STRTOLL) #if !defined(HAVE_STRTOLL) && defined(HAVE___STRTOLL)
#define strtoll __strtoll #define strtoll __strtoll
...@@ -1232,7 +1231,6 @@ extern long long strtoll(const char *str, char **endptr, int base); ...@@ -1232,7 +1231,6 @@ extern long long strtoll(const char *str, char **endptr, int base);
#if defined(HAVE_STRTOULL) && !HAVE_DECL_STRTOULL #if defined(HAVE_STRTOULL) && !HAVE_DECL_STRTOULL
extern unsigned long long strtoull(const char *str, char **endptr, int base); extern unsigned long long strtoull(const char *str, char **endptr, int base);
#endif #endif
#endif /* HAVE_LONG_LONG_INT */
#if !defined(HAVE_MEMMOVE) && !defined(memmove) #if !defined(HAVE_MEMMOVE) && !defined(memmove)
#define memmove(d, s, c) bcopy(s, d, c) #define memmove(d, s, c) bcopy(s, d, c)
......
src/include/pg_config.h.in
View file @ effa4028
...@@ -383,9 +383,6 @@ ...@@ -383,9 +383,6 @@
/* Define to 1 if `long int' works and is 64 bits. */ /* Define to 1 if `long int' works and is 64 bits. */
#undef HAVE_LONG_INT_64 #undef HAVE_LONG_INT_64
/* Define to 1 if the system has the type `long long int'. */
#undef HAVE_LONG_LONG_INT
/* Define to 1 if `long long int' works and is 64 bits. */ /* Define to 1 if `long long int' works and is 64 bits. */
#undef HAVE_LONG_LONG_INT_64 #undef HAVE_LONG_LONG_INT_64
...@@ -684,9 +681,6 @@ ...@@ -684,9 +681,6 @@
/* Define to 1 if you have the `unsetenv' function. */ /* Define to 1 if you have the `unsetenv' function. */
#undef HAVE_UNSETENV #undef HAVE_UNSETENV
/* Define to 1 if the system has the type `unsigned long long int'. */
#undef HAVE_UNSIGNED_LONG_LONG_INT
/* Define to 1 if you have the `uselocale' function. */ /* Define to 1 if you have the `uselocale' function. */
#undef HAVE_USELOCALE #undef HAVE_USELOCALE
......
src/include/pg_config.h.win32
View file @ effa4028
...@@ -267,9 +267,6 @@ ...@@ -267,9 +267,6 @@
/* Define to 1 if `long int' works and is 64 bits. */ /* Define to 1 if `long int' works and is 64 bits. */
/* #undef HAVE_LONG_INT_64 */ /* #undef HAVE_LONG_INT_64 */
/* Define to 1 if the system has the type `long long int'. */
#define HAVE_LONG_LONG_INT 1
/* Define to 1 if `long long int' works and is 64 bits. */ /* Define to 1 if `long long int' works and is 64 bits. */
#define HAVE_LONG_LONG_INT_64 1 #define HAVE_LONG_LONG_INT_64 1
......
src/interfaces/ecpg/ecpglib/data.c
View file @ effa4028
...@@ -267,12 +267,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ...@@ -267,12 +267,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
case ECPGt_unsigned_long: case ECPGt_unsigned_long:
*((long *) (ind + ind_offset * act_tuple)) = value_for_indicator; *((long *) (ind + ind_offset * act_tuple)) = value_for_indicator;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
*((long long int *) (ind + ind_offset * act_tuple)) = value_for_indicator; *((long long int *) (ind + ind_offset * act_tuple)) = value_for_indicator;
break; break;
#endif /* HAVE_LONG_LONG_INT */
case ECPGt_NO_INDICATOR: case ECPGt_NO_INDICATOR:
if (value_for_indicator == -1) if (value_for_indicator == -1)
{ {
...@@ -355,12 +353,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ...@@ -355,12 +353,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
case ECPGt_unsigned_long: case ECPGt_unsigned_long:
*((long *) (ind + ind_offset * act_tuple)) = size; *((long *) (ind + ind_offset * act_tuple)) = size;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
*((long long int *) (ind + ind_offset * act_tuple)) = size; *((long long int *) (ind + ind_offset * act_tuple)) = size;
break; break;
#endif /* HAVE_LONG_LONG_INT */
default: default:
break; break;
} }
...@@ -442,7 +438,6 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ...@@ -442,7 +438,6 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
} }
break; break;
#ifdef HAVE_LONG_LONG_INT
#ifdef HAVE_STRTOLL #ifdef HAVE_STRTOLL
case ECPGt_long_long: case ECPGt_long_long:
*((long long int *) (var + offset * act_tuple)) = strtoll(pval, &scan_length, 10); *((long long int *) (var + offset * act_tuple)) = strtoll(pval, &scan_length, 10);
...@@ -467,7 +462,6 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ...@@ -467,7 +462,6 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
break; break;
#endif /* HAVE_STRTOULL */ #endif /* HAVE_STRTOULL */
#endif /* HAVE_LONG_LONG_INT */
case ECPGt_float: case ECPGt_float:
case ECPGt_double: case ECPGt_double:
...@@ -559,12 +553,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ...@@ -559,12 +553,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
case ECPGt_unsigned_long: case ECPGt_unsigned_long:
*((long *) (ind + ind_offset * act_tuple)) = rcv_size; *((long *) (ind + ind_offset * act_tuple)) = rcv_size;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
*((long long int *) (ind + ind_offset * act_tuple)) = rcv_size; *((long long int *) (ind + ind_offset * act_tuple)) = rcv_size;
break; break;
#endif /* HAVE_LONG_LONG_INT */
default: default:
break; break;
} }
...@@ -623,12 +615,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ...@@ -623,12 +615,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
case ECPGt_unsigned_long: case ECPGt_unsigned_long:
*((long *) (ind + ind_offset * act_tuple)) = -1; *((long *) (ind + ind_offset * act_tuple)) = -1;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
*((long long int *) (ind + ind_offset * act_tuple)) = -1; *((long long int *) (ind + ind_offset * act_tuple)) = -1;
break; break;
#endif /* HAVE_LONG_LONG_INT */
default: default:
break; break;
} }
...@@ -678,12 +668,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ...@@ -678,12 +668,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
case ECPGt_unsigned_long: case ECPGt_unsigned_long:
*((long *) (ind + ind_offset * act_tuple)) = size; *((long *) (ind + ind_offset * act_tuple)) = size;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
*((long long int *) (ind + ind_offset * act_tuple)) = size; *((long long int *) (ind + ind_offset * act_tuple)) = size;
break; break;
#endif /* HAVE_LONG_LONG_INT */
default: default:
break; break;
} }
...@@ -723,12 +711,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, ...@@ -723,12 +711,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
case ECPGt_unsigned_long: case ECPGt_unsigned_long:
*((long *) (ind + ind_offset * act_tuple)) = variable->len; *((long *) (ind + ind_offset * act_tuple)) = variable->len;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
*((long long int *) (ind + ind_offset * act_tuple)) = variable->len; *((long long int *) (ind + ind_offset * act_tuple)) = variable->len;
break; break;
#endif /* HAVE_LONG_LONG_INT */
default: default:
break; break;
} }
......
src/interfaces/ecpg/ecpglib/descriptor.c
View file @ effa4028
...@@ -134,14 +134,12 @@ get_int_item(int lineno, void *var, enum ECPGttype vartype, int value) ...@@ -134,14 +134,12 @@ get_int_item(int lineno, void *var, enum ECPGttype vartype, int value)
case ECPGt_unsigned_long: case ECPGt_unsigned_long:
*(unsigned long *) var = (unsigned long) value; *(unsigned long *) var = (unsigned long) value;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
*(long long int *) var = (long long int) value; *(long long int *) var = (long long int) value;
break; break;
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
*(unsigned long long int *) var = (unsigned long long int) value; *(unsigned long long int *) var = (unsigned long long int) value;
break; break;
#endif /* HAVE_LONG_LONG_INT */
case ECPGt_float: case ECPGt_float:
*(float *) var = (float) value; *(float *) var = (float) value;
break; break;
...@@ -179,14 +177,12 @@ set_int_item(int lineno, int *target, const void *var, enum ECPGttype vartype) ...@@ -179,14 +177,12 @@ set_int_item(int lineno, int *target, const void *var, enum ECPGttype vartype)
case ECPGt_unsigned_long: case ECPGt_unsigned_long:
*target = *(const unsigned long *) var; *target = *(const unsigned long *) var;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
*target = *(const long long int *) var; *target = *(const long long int *) var;
break; break;
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
*target = *(const unsigned long long int *) var; *target = *(const unsigned long long int *) var;
break; break;
#endif /* HAVE_LONG_LONG_INT */
case ECPGt_float: case ECPGt_float:
*target = *(const float *) var; *target = *(const float *) var;
break; break;
......
src/interfaces/ecpg/ecpglib/execute.c
View file @ effa4028
...@@ -543,13 +543,11 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -543,13 +543,11 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
if (*(long *) var->ind_value < 0L) if (*(long *) var->ind_value < 0L)
*tobeinserted_p = NULL; *tobeinserted_p = NULL;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
if (*(long long int *) var->ind_value < (long long) 0) if (*(long long int *) var->ind_value < (long long) 0)
*tobeinserted_p = NULL; *tobeinserted_p = NULL;
break; break;
#endif /* HAVE_LONG_LONG_INT */
case ECPGt_NO_INDICATOR: case ECPGt_NO_INDICATOR:
if (force_indicator == false) if (force_indicator == false)
{ {
...@@ -681,7 +679,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -681,7 +679,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
*tobeinserted_p = mallocedval; *tobeinserted_p = mallocedval;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
if (!(mallocedval = ecpg_alloc(asize * 30, lineno))) if (!(mallocedval = ecpg_alloc(asize * 30, lineno)))
return false; return false;
...@@ -719,7 +717,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari ...@@ -719,7 +717,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari
*tobeinserted_p = mallocedval; *tobeinserted_p = mallocedval;
break; break;
#endif /* HAVE_LONG_LONG_INT */
case ECPGt_float: case ECPGt_float:
if (!(mallocedval = ecpg_alloc(asize * 25, lineno))) if (!(mallocedval = ecpg_alloc(asize * 25, lineno)))
return false; return false;
......
src/interfaces/ecpg/ecpglib/misc.c
View file @ effa4028
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include "pg_config_paths.h" #include "pg_config_paths.h"
#include "sqlca.h" #include "sqlca.h"
#ifdef HAVE_LONG_LONG_INT
#ifndef LONG_LONG_MIN #ifndef LONG_LONG_MIN
#ifdef LLONG_MIN #ifdef LLONG_MIN
#define LONG_LONG_MIN LLONG_MIN #define LONG_LONG_MIN LLONG_MIN
...@@ -26,7 +25,6 @@ ...@@ -26,7 +25,6 @@
#define LONG_LONG_MIN LONGLONG_MIN #define LONG_LONG_MIN LONGLONG_MIN
#endif /* LLONG_MIN */ #endif /* LLONG_MIN */
#endif /* LONG_LONG_MIN */ #endif /* LONG_LONG_MIN */
#endif /* HAVE_LONG_LONG_INT */
bool ecpg_internal_regression_mode = false; bool ecpg_internal_regression_mode = false;
...@@ -340,12 +338,10 @@ ECPGset_noind_null(enum ECPGttype type, void *ptr) ...@@ -340,12 +338,10 @@ ECPGset_noind_null(enum ECPGttype type, void *ptr)
case ECPGt_date: case ECPGt_date:
*((long *) ptr) = LONG_MIN; *((long *) ptr) = LONG_MIN;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
*((long long *) ptr) = LONG_LONG_MIN; *((long long *) ptr) = LONG_LONG_MIN;
break; break;
#endif /* HAVE_LONG_LONG_INT */
case ECPGt_float: case ECPGt_float:
memset((char *) ptr, 0xff, sizeof(float)); memset((char *) ptr, 0xff, sizeof(float));
break; break;
...@@ -415,13 +411,11 @@ ECPGis_noind_null(enum ECPGttype type, const void *ptr) ...@@ -415,13 +411,11 @@ ECPGis_noind_null(enum ECPGttype type, const void *ptr)
if (*((const long *) ptr) == LONG_MIN) if (*((const long *) ptr) == LONG_MIN)
return true; return true;
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
case ECPGt_unsigned_long_long: case ECPGt_unsigned_long_long:
if (*((const long long *) ptr) == LONG_LONG_MIN) if (*((const long long *) ptr) == LONG_LONG_MIN)
return true; return true;
break; break;
#endif /* HAVE_LONG_LONG_INT */
case ECPGt_float: case ECPGt_float:
return _check(ptr, sizeof(float)); return _check(ptr, sizeof(float));
break; break;
......
src/interfaces/ecpg/include/ecpg_config.h.in
View file @ effa4028
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#undef HAVE_LONG_INT_64 #undef HAVE_LONG_INT_64
/* Define to 1 if the system has the type `long long int'. */ /* Define to 1 if the system has the type `long long int'. */
#undef HAVE_LONG_LONG_INT #define HAVE_LONG_LONG_INT 1
/* Define to 1 if `long long int' works and is 64 bits. */ /* Define to 1 if `long long int' works and is 64 bits. */
#undef HAVE_LONG_LONG_INT_64 #undef HAVE_LONG_LONG_INT_64
......
src/interfaces/ecpg/preproc/ecpg.trailer
View file @ effa4028
...@@ -796,22 +796,8 @@ unsigned_type: SQL_UNSIGNED SQL_SHORT { $$ = ECPGt_unsigned_short; } ...@@ -796,22 +796,8 @@ unsigned_type: SQL_UNSIGNED SQL_SHORT { $$ = ECPGt_unsigned_short; }
| SQL_UNSIGNED INT_P { $$ = ECPGt_unsigned_int; } | SQL_UNSIGNED INT_P { $$ = ECPGt_unsigned_int; }
| SQL_UNSIGNED SQL_LONG { $$ = ECPGt_unsigned_long; } | SQL_UNSIGNED SQL_LONG { $$ = ECPGt_unsigned_long; }
| SQL_UNSIGNED SQL_LONG INT_P { $$ = ECPGt_unsigned_long; } | SQL_UNSIGNED SQL_LONG INT_P { $$ = ECPGt_unsigned_long; }
| SQL_UNSIGNED SQL_LONG SQL_LONG | SQL_UNSIGNED SQL_LONG SQL_LONG { $$ = ECPGt_unsigned_long_long; }
{ | SQL_UNSIGNED SQL_LONG SQL_LONG INT_P { $$ = ECPGt_unsigned_long_long; }
#ifdef HAVE_LONG_LONG_INT
$$ = ECPGt_unsigned_long_long;
#else
$$ = ECPGt_unsigned_long;
#endif
}
| SQL_UNSIGNED SQL_LONG SQL_LONG INT_P
{
#ifdef HAVE_LONG_LONG_INT
$$ = ECPGt_unsigned_long_long;
#else
$$ = ECPGt_unsigned_long;
#endif
}
| SQL_UNSIGNED CHAR_P { $$ = ECPGt_unsigned_char; } | SQL_UNSIGNED CHAR_P { $$ = ECPGt_unsigned_char; }
; ;
...@@ -820,22 +806,8 @@ signed_type: SQL_SHORT { $$ = ECPGt_short; } ...@@ -820,22 +806,8 @@ signed_type: SQL_SHORT { $$ = ECPGt_short; }
| INT_P { $$ = ECPGt_int; } | INT_P { $$ = ECPGt_int; }
| SQL_LONG { $$ = ECPGt_long; } | SQL_LONG { $$ = ECPGt_long; }
| SQL_LONG INT_P { $$ = ECPGt_long; } | SQL_LONG INT_P { $$ = ECPGt_long; }
| SQL_LONG SQL_LONG | SQL_LONG SQL_LONG { $$ = ECPGt_long_long; }
{ | SQL_LONG SQL_LONG INT_P { $$ = ECPGt_long_long; }
#ifdef HAVE_LONG_LONG_INT
$$ = ECPGt_long_long;
#else
$$ = ECPGt_long;
#endif
}
| SQL_LONG SQL_LONG INT_P
{
#ifdef HAVE_LONG_LONG_INT
$$ = ECPGt_long_long;
#else
$$ = ECPGt_long;
#endif
}
| SQL_BOOL { $$ = ECPGt_bool; } | SQL_BOOL { $$ = ECPGt_bool; }
| CHAR_P { $$ = ECPGt_char; } | CHAR_P { $$ = ECPGt_char; }
| DOUBLE_P { $$ = ECPGt_double; } | DOUBLE_P { $$ = ECPGt_double; }
......
src/interfaces/ecpg/test/expected/sql-sqlda.c
View file @ effa4028
...@@ -154,7 +154,6 @@ dump_sqlda(sqlda_t *sqlda) ...@@ -154,7 +154,6 @@ dump_sqlda(sqlda_t *sqlda)
case ECPGt_long: case ECPGt_long:
printf("name sqlda descriptor: '%s' value %ld\n", sqlda->sqlvar[i].sqlname.data, *(long int *)sqlda->sqlvar[i].sqldata); printf("name sqlda descriptor: '%s' value %ld\n", sqlda->sqlvar[i].sqlname.data, *(long int *)sqlda->sqlvar[i].sqldata);
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
printf( printf(
#ifdef _WIN32 #ifdef _WIN32
...@@ -164,7 +163,6 @@ dump_sqlda(sqlda_t *sqlda) ...@@ -164,7 +163,6 @@ dump_sqlda(sqlda_t *sqlda)
#endif #endif
sqlda->sqlvar[i].sqlname.data, *(long long int *)sqlda->sqlvar[i].sqldata); sqlda->sqlvar[i].sqlname.data, *(long long int *)sqlda->sqlvar[i].sqldata);
break; break;
#endif
case ECPGt_double: case ECPGt_double:
printf("name sqlda descriptor: '%s' value %f\n", sqlda->sqlvar[i].sqlname.data, *(double *)sqlda->sqlvar[i].sqldata); printf("name sqlda descriptor: '%s' value %f\n", sqlda->sqlvar[i].sqlname.data, *(double *)sqlda->sqlvar[i].sqldata);
break; break;
...@@ -190,19 +188,19 @@ main (void) ...@@ -190,19 +188,19 @@ main (void)
#line 73 "sqlda.pgc" #line 71 "sqlda.pgc"
char * stmt1 = "SELECT * FROM t1" ; char * stmt1 = "SELECT * FROM t1" ;
#line 74 "sqlda.pgc" #line 72 "sqlda.pgc"
char * stmt2 = "SELECT * FROM t1 WHERE id = ?" ; char * stmt2 = "SELECT * FROM t1 WHERE id = ?" ;
#line 75 "sqlda.pgc" #line 73 "sqlda.pgc"
int rec ; int rec ;
#line 76 "sqlda.pgc" #line 74 "sqlda.pgc"
int id ; int id ;
/* exec sql end declare section */ /* exec sql end declare section */
#line 77 "sqlda.pgc" #line 75 "sqlda.pgc"
char msg[128]; char msg[128];
...@@ -211,42 +209,42 @@ main (void) ...@@ -211,42 +209,42 @@ main (void)
strcpy(msg, "connect"); strcpy(msg, "connect");
{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , "regress1", 0); { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , "regress1", 0);
#line 84 "sqlda.pgc" #line 82 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 84 "sqlda.pgc" #line 82 "sqlda.pgc"
strcpy(msg, "set"); strcpy(msg, "set");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT);
#line 87 "sqlda.pgc" #line 85 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 87 "sqlda.pgc" #line 85 "sqlda.pgc"
strcpy(msg, "create"); strcpy(msg, "create");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table t1 ( id integer , t text , d1 numeric , d2 float8 , c char ( 10 ) , big bigint )", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table t1 ( id integer , t text , d1 numeric , d2 float8 , c char ( 10 ) , big bigint )", ECPGt_EOIT, ECPGt_EORT);
#line 97 "sqlda.pgc" #line 95 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 97 "sqlda.pgc" #line 95 "sqlda.pgc"
strcpy(msg, "insert"); strcpy(msg, "insert");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' , 1111111111111111111 ) , ( 2 , null , null , null , null , null ) , ( 3 , 'c' , 0.0 , 3 , 'c' , 3333333333333333333 ) , ( 4 , 'd' , 'NaN' , 4 , 'd' , 4444444444444444444 ) , ( 5 , 'e' , 0.001234 , 5 , 'e' , 5555555555555555555 )", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' , 1111111111111111111 ) , ( 2 , null , null , null , null , null ) , ( 3 , 'c' , 0.0 , 3 , 'c' , 3333333333333333333 ) , ( 4 , 'd' , 'NaN' , 4 , 'd' , 4444444444444444444 ) , ( 5 , 'e' , 0.001234 , 5 , 'e' , 5555555555555555555 )", ECPGt_EOIT, ECPGt_EORT);
#line 105 "sqlda.pgc" #line 103 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 105 "sqlda.pgc" #line 103 "sqlda.pgc"
strcpy(msg, "commit"); strcpy(msg, "commit");
{ ECPGtrans(__LINE__, NULL, "commit"); { ECPGtrans(__LINE__, NULL, "commit");
#line 108 "sqlda.pgc" #line 106 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 108 "sqlda.pgc" #line 106 "sqlda.pgc"
/* SQLDA test for getting all records from a table */ /* SQLDA test for getting all records from a table */
...@@ -255,29 +253,29 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -255,29 +253,29 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "prepare"); strcpy(msg, "prepare");
{ ECPGprepare(__LINE__, NULL, 0, "st_id1", stmt1); { ECPGprepare(__LINE__, NULL, 0, "st_id1", stmt1);
#line 115 "sqlda.pgc" #line 113 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 115 "sqlda.pgc" #line 113 "sqlda.pgc"
strcpy(msg, "declare"); strcpy(msg, "declare");
/* declare mycur1 cursor for $1 */ /* declare mycur1 cursor for $1 */
#line 118 "sqlda.pgc" #line 116 "sqlda.pgc"
strcpy(msg, "open"); strcpy(msg, "open");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare mycur1 cursor for $1", { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare mycur1 cursor for $1",
ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id1", __LINE__)),(long)1,(long)1,(1)*sizeof(char), ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id1", __LINE__)),(long)1,(long)1,(1)*sizeof(char),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
#line 121 "sqlda.pgc" #line 119 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 121 "sqlda.pgc" #line 119 "sqlda.pgc"
/* exec sql whenever not found break ; */ /* exec sql whenever not found break ; */
#line 123 "sqlda.pgc" #line 121 "sqlda.pgc"
rec = 0; rec = 0;
...@@ -287,13 +285,13 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -287,13 +285,13 @@ if (sqlca.sqlcode < 0) exit (1);}
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch 1 from mycur1", ECPGt_EOIT, { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch 1 from mycur1", ECPGt_EOIT,
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 129 "sqlda.pgc" #line 127 "sqlda.pgc"
if (sqlca.sqlcode == ECPG_NOT_FOUND) break; if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
#line 129 "sqlda.pgc" #line 127 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 129 "sqlda.pgc" #line 127 "sqlda.pgc"
printf("FETCH RECORD %d\n", ++rec); printf("FETCH RECORD %d\n", ++rec);
...@@ -301,23 +299,23 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -301,23 +299,23 @@ if (sqlca.sqlcode < 0) exit (1);}
} }
/* exec sql whenever not found continue ; */ /* exec sql whenever not found continue ; */
#line 135 "sqlda.pgc" #line 133 "sqlda.pgc"
strcpy(msg, "close"); strcpy(msg, "close");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close mycur1", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close mycur1", ECPGt_EOIT, ECPGt_EORT);
#line 138 "sqlda.pgc" #line 136 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 138 "sqlda.pgc" #line 136 "sqlda.pgc"
strcpy(msg, "deallocate"); strcpy(msg, "deallocate");
{ ECPGdeallocate(__LINE__, 0, NULL, "st_id1"); { ECPGdeallocate(__LINE__, 0, NULL, "st_id1");
#line 141 "sqlda.pgc" #line 139 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 141 "sqlda.pgc" #line 139 "sqlda.pgc"
free(outp_sqlda); free(outp_sqlda);
...@@ -328,35 +326,35 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -328,35 +326,35 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "prepare"); strcpy(msg, "prepare");
{ ECPGprepare(__LINE__, NULL, 0, "st_id2", stmt1); { ECPGprepare(__LINE__, NULL, 0, "st_id2", stmt1);
#line 150 "sqlda.pgc" #line 148 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 150 "sqlda.pgc" #line 148 "sqlda.pgc"
strcpy(msg, "declare"); strcpy(msg, "declare");
/* declare mycur2 cursor for $1 */ /* declare mycur2 cursor for $1 */
#line 153 "sqlda.pgc" #line 151 "sqlda.pgc"
strcpy(msg, "open"); strcpy(msg, "open");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare mycur2 cursor for $1", { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare mycur2 cursor for $1",
ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id2", __LINE__)),(long)1,(long)1,(1)*sizeof(char), ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id2", __LINE__)),(long)1,(long)1,(1)*sizeof(char),
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT); ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
#line 156 "sqlda.pgc" #line 154 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 156 "sqlda.pgc" #line 154 "sqlda.pgc"
strcpy(msg, "fetch"); strcpy(msg, "fetch");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch all from mycur2", ECPGt_EOIT, { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch all from mycur2", ECPGt_EOIT,
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 159 "sqlda.pgc" #line 157 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 159 "sqlda.pgc" #line 157 "sqlda.pgc"
outp_sqlda1 = outp_sqlda; outp_sqlda1 = outp_sqlda;
...@@ -374,18 +372,18 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -374,18 +372,18 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "close"); strcpy(msg, "close");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close mycur2", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close mycur2", ECPGt_EOIT, ECPGt_EORT);
#line 175 "sqlda.pgc" #line 173 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 175 "sqlda.pgc" #line 173 "sqlda.pgc"
strcpy(msg, "deallocate"); strcpy(msg, "deallocate");
{ ECPGdeallocate(__LINE__, 0, NULL, "st_id2"); { ECPGdeallocate(__LINE__, 0, NULL, "st_id2");
#line 178 "sqlda.pgc" #line 176 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 178 "sqlda.pgc" #line 176 "sqlda.pgc"
/* SQLDA test for getting one record using an input descriptor */ /* SQLDA test for getting one record using an input descriptor */
...@@ -409,10 +407,10 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -409,10 +407,10 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "prepare"); strcpy(msg, "prepare");
{ ECPGprepare(__LINE__, NULL, 0, "st_id3", stmt2); { ECPGprepare(__LINE__, NULL, 0, "st_id3", stmt2);
#line 200 "sqlda.pgc" #line 198 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 200 "sqlda.pgc" #line 198 "sqlda.pgc"
strcpy(msg, "execute"); strcpy(msg, "execute");
...@@ -421,20 +419,20 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -421,20 +419,20 @@ if (sqlca.sqlcode < 0) exit (1);}
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT,
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 203 "sqlda.pgc" #line 201 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 203 "sqlda.pgc" #line 201 "sqlda.pgc"
dump_sqlda(outp_sqlda); dump_sqlda(outp_sqlda);
strcpy(msg, "deallocate"); strcpy(msg, "deallocate");
{ ECPGdeallocate(__LINE__, 0, NULL, "st_id3"); { ECPGdeallocate(__LINE__, 0, NULL, "st_id3");
#line 208 "sqlda.pgc" #line 206 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 208 "sqlda.pgc" #line 206 "sqlda.pgc"
free(inp_sqlda); free(inp_sqlda);
...@@ -445,10 +443,10 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -445,10 +443,10 @@ if (sqlca.sqlcode < 0) exit (1);}
*/ */
{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , "con2", 0); { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , "con2", 0);
#line 217 "sqlda.pgc" #line 215 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 217 "sqlda.pgc" #line 215 "sqlda.pgc"
/* /*
...@@ -470,10 +468,10 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -470,10 +468,10 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "prepare"); strcpy(msg, "prepare");
{ ECPGprepare(__LINE__, "con2", 0, "st_id4", stmt2); { ECPGprepare(__LINE__, "con2", 0, "st_id4", stmt2);
#line 237 "sqlda.pgc" #line 235 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 237 "sqlda.pgc" #line 235 "sqlda.pgc"
strcpy(msg, "execute"); strcpy(msg, "execute");
...@@ -482,28 +480,28 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -482,28 +480,28 @@ if (sqlca.sqlcode < 0) exit (1);}
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT,
ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L,
ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
#line 240 "sqlda.pgc" #line 238 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 240 "sqlda.pgc" #line 238 "sqlda.pgc"
dump_sqlda(outp_sqlda); dump_sqlda(outp_sqlda);
strcpy(msg, "commit"); strcpy(msg, "commit");
{ ECPGtrans(__LINE__, "con2", "commit"); { ECPGtrans(__LINE__, "con2", "commit");
#line 245 "sqlda.pgc" #line 243 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 245 "sqlda.pgc" #line 243 "sqlda.pgc"
strcpy(msg, "deallocate"); strcpy(msg, "deallocate");
{ ECPGdeallocate(__LINE__, 0, NULL, "st_id4"); { ECPGdeallocate(__LINE__, 0, NULL, "st_id4");
#line 248 "sqlda.pgc" #line 246 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 248 "sqlda.pgc" #line 246 "sqlda.pgc"
free(inp_sqlda); free(inp_sqlda);
...@@ -511,36 +509,36 @@ if (sqlca.sqlcode < 0) exit (1);} ...@@ -511,36 +509,36 @@ if (sqlca.sqlcode < 0) exit (1);}
strcpy(msg, "disconnect"); strcpy(msg, "disconnect");
{ ECPGdisconnect(__LINE__, "con2"); { ECPGdisconnect(__LINE__, "con2");
#line 254 "sqlda.pgc" #line 252 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 254 "sqlda.pgc" #line 252 "sqlda.pgc"
/* End test */ /* End test */
strcpy(msg, "drop"); strcpy(msg, "drop");
{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table t1", ECPGt_EOIT, ECPGt_EORT); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table t1", ECPGt_EOIT, ECPGt_EORT);
#line 259 "sqlda.pgc" #line 257 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 259 "sqlda.pgc" #line 257 "sqlda.pgc"
strcpy(msg, "commit"); strcpy(msg, "commit");
{ ECPGtrans(__LINE__, NULL, "commit"); { ECPGtrans(__LINE__, NULL, "commit");
#line 262 "sqlda.pgc" #line 260 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 262 "sqlda.pgc" #line 260 "sqlda.pgc"
strcpy(msg, "disconnect"); strcpy(msg, "disconnect");
{ ECPGdisconnect(__LINE__, "CURRENT"); { ECPGdisconnect(__LINE__, "CURRENT");
#line 265 "sqlda.pgc" #line 263 "sqlda.pgc"
if (sqlca.sqlcode < 0) exit (1);} if (sqlca.sqlcode < 0) exit (1);}
#line 265 "sqlda.pgc" #line 263 "sqlda.pgc"
return 0; return 0;
......
src/interfaces/ecpg/test/sql/sqlda.pgc
View file @ effa4028
...@@ -39,7 +39,6 @@ dump_sqlda(sqlda_t *sqlda) ...@@ -39,7 +39,6 @@ dump_sqlda(sqlda_t *sqlda)
case ECPGt_long: case ECPGt_long:
printf("name sqlda descriptor: '%s' value %ld\n", sqlda->sqlvar[i].sqlname.data, *(long int *)sqlda->sqlvar[i].sqldata); printf("name sqlda descriptor: '%s' value %ld\n", sqlda->sqlvar[i].sqlname.data, *(long int *)sqlda->sqlvar[i].sqldata);
break; break;
#ifdef HAVE_LONG_LONG_INT
case ECPGt_long_long: case ECPGt_long_long:
printf( printf(
#ifdef _WIN32 #ifdef _WIN32
...@@ -49,7 +48,6 @@ dump_sqlda(sqlda_t *sqlda) ...@@ -49,7 +48,6 @@ dump_sqlda(sqlda_t *sqlda)
#endif #endif
sqlda->sqlvar[i].sqlname.data, *(long long int *)sqlda->sqlvar[i].sqldata); sqlda->sqlvar[i].sqlname.data, *(long long int *)sqlda->sqlvar[i].sqldata);
break; break;
#endif
case ECPGt_double: case ECPGt_double:
printf("name sqlda descriptor: '%s' value %f\n", sqlda->sqlvar[i].sqlname.data, *(double *)sqlda->sqlvar[i].sqldata); printf("name sqlda descriptor: '%s' value %f\n", sqlda->sqlvar[i].sqlname.data, *(double *)sqlda->sqlvar[i].sqldata);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment