rpl/src/instructions_s8.c - diff

Return to instructions_s8.c CVS log

Up to [local] / rpl / src

Diff for /rpl/src/instructions_s8.c between versions 1.39 and 1.40

version 1.39, 2011/09/26 15:57:16	version 1.40, 2011/11/18 21:03:24
Line 787 instruction_sqlquery(struct_processus *s	Line 787 instruction_sqlquery(struct_processus *s
{	{
# define d_LONGUEUR 1024	# define d_LONGUEUR 1024

	# if defined(MYSQL_SUPPORT) \|\| defined(POSTGRESQL_SUPPORT)
logical1 connexion_permanente;	logical1 connexion_permanente;
logical1 presence_resultat;	# endif

struct_objet *s_copie_1;	struct_objet *s_copie_1;
struct_objet *s_objet_1;	struct_objet *s_objet_1;
struct_objet *s_copie_2;	struct_objet *s_copie_2;
struct_objet *s_objet_2;	struct_objet *s_objet_2;
struct_objet *s_objet_resultat;

struct_liste_chainee *l_element_courant;
struct_liste_chainee *l_element_courant_ligne;

unsigned char *tampon;	unsigned char *tampon;

unsigned int i;
unsigned int j;
unsigned int nombre_colonnes;
unsigned int nombre_lignes;

(*s_etat_processus).erreur_execution = d_ex;	(*s_etat_processus).erreur_execution = d_ex;

if ((*s_etat_processus).affichage_arguments == 'Y')	if ((*s_etat_processus).affichage_arguments == 'Y')
Line 880 instruction_sqlquery(struct_processus *s	Line 872 instruction_sqlquery(struct_processus *s

if ((*s_objet_1).type == LST)	if ((*s_objet_1).type == LST)
{	{
	# if defined(MYSQL_SUPPORT) \|\| defined(POSTGRESQL_SUPPORT)
connexion_permanente = d_faux;	connexion_permanente = d_faux;
	# endif

s_copie_1 = s_objet_1;	s_copie_1 = s_objet_1;

Line 910 instruction_sqlquery(struct_processus *s	Line 904 instruction_sqlquery(struct_processus *s
}	}
}	}

	# if defined(MYSQL_SUPPORT) \|\| defined(POSTGRESQL_SUPPORT)
connexion_permanente = d_vrai;	connexion_permanente = d_vrai;
	# endif
}	}

if (((s_objet_1).type == SQL) && ((s_objet_2).type == CHN))	if (((s_objet_1).type == SQL) && ((s_objet_2).type == CHN))
Line 952 instruction_sqlquery(struct_processus *s	Line 948 instruction_sqlquery(struct_processus *s
{	{
# ifdef MYSQL_SUPPORT	# ifdef MYSQL_SUPPORT

MYSQL_RES *resultat_mysql;	unsigned int i;
MYSQL_ROW ligne;	unsigned int nombre_colonnes;

	logical1 presence_resultat;

	MYSQL_RES *resultat_mysql;
	MYSQL_ROW ligne;

	struct_objet *s_objet_resultat;

	struct_liste_chainee *l_element_courant;
	struct_liste_chainee *l_element_courant_ligne;

if (mysql_real_query((((struct_connecteur_sql ) (*s_objet_1)	if (mysql_real_query((((struct_connecteur_sql ) (*s_objet_1)
.objet)).descripteur.mysql, (unsigned char ) (s_objet_2)	.objet)).descripteur.mysql, (unsigned char ) (s_objet_2)
Line 1155 instruction_sqlquery(struct_processus *s	Line 1161 instruction_sqlquery(struct_processus *s
{	{
# ifdef POSTGRESQL_SUPPORT	# ifdef POSTGRESQL_SUPPORT

PGresult *resultat_postgresql;	unsigned int i;
	unsigned int j;
	unsigned int nombre_colonnes;
	unsigned int nombre_lignes;

	logical1 presence_resultat;

	PGresult *resultat_postgresql;

	struct_objet *s_objet_resultat;

	struct_liste_chainee *l_element_courant;
	struct_liste_chainee *l_element_courant_ligne;

if (PQstatus((((struct_connecteur_sql ) (*s_objet_1).objet))	if (PQstatus((((struct_connecteur_sql ) (*s_objet_1).objet))
.descripteur.postgresql) != CONNECTION_OK)	.descripteur.postgresql) != CONNECTION_OK)

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.39
changed lines
	Added in v.1.40