libgda-freetds_buildfix.patch

   1 --- libgda-1.9.100/providers/freetds/gda-freetds-message.c.orig 2003-01-16 01:10:30.000000000 +0100
   2 +++ libgda-1.9.100/providers/freetds/gda-freetds-message.c      2005-10-20 11:20:09.000000000 +0200
   3 @@ -32,7 +32,7 @@
   4
   5  GdaFreeTDSMessage
   6  *gda_freetds_message_new (GdaConnection *cnc,
   7 -                          TDSMSGINFO *info,
   8 +                          TDSMESSAGE *info,
   9                            const gboolean is_err_msg)
  10  {
  11         GdaFreeTDSConnectionData *tds_cnc;
  12 @@ -46,7 +46,7 @@
  13         g_return_val_if_fail (message != NULL, NULL);
  14
  15         message->is_err_msg = is_err_msg;
  16 -       memcpy ((void *) &message->msg, (void *) info, sizeof (TDSMSGINFO));
  17 +       memcpy ((void *) &message->msg, (void *) info, sizeof (TDSMESSAGE));
  18         if (info->server != NULL)
  19                 message->msg.server = g_strdup (info->server);
  20         if (info->message != NULL)
  21 @@ -61,7 +61,7 @@
  22
  23  GdaFreeTDSMessage *
  24  gda_freetds_message_add (GdaConnection *cnc,
  25 -                         TDSMSGINFO *info,
  26 +                         TDSMESSAGE *info,
  27                           const gboolean is_err_msg)
  28  {
  29         GdaFreeTDSMessage *msg = NULL;
  30 --- libgda-1.9.100/providers/freetds/gda-freetds-message.h.orig 2003-01-16 01:10:30.000000000 +0100
  31 +++ libgda-1.9.100/providers/freetds/gda-freetds-message.h      2005-10-20 11:20:21.000000000 +0200
  32 @@ -39,14 +39,14 @@
  33  struct _GdaFreeTDSMessage {
  34         gboolean    is_err_msg;
  35
  36 -       TDSMSGINFO  msg;
  37 +       TDSMESSAGE  msg;
  38  };
  39
  40  GdaFreeTDSMessage *gda_freetds_message_new (GdaConnection *cnc,
  41 -                                            TDSMSGINFO *info,
  42 +                                            TDSMESSAGE *info,
  43                                              const gboolean is_err_msg);
  44  GdaFreeTDSMessage *gda_freetds_message_add (GdaConnection *cnc,
  45 -                                            TDSMSGINFO *info,
  46 +                                            TDSMESSAGE *info,
  47                                              const gboolean is_err_msg);
  48  void gda_freetds_message_free (GdaFreeTDSMessage *message);
  49
  50 --- libgda-1.9.100/providers/freetds/gda-freetds-provider.c.orig        2005-09-22 12:24:01.000000000 +0200
  51 +++ libgda-1.9.100/providers/freetds/gda-freetds-provider.c     2005-10-20 11:33:03.000000000 +0200
  52 @@ -120,10 +120,10 @@
  53  #if defined(HAVE_FREETDS_VER0_6X) || defined(HAVE_FREETDS_VER0_60)
  54    static int gda_freetds_provider_tds_handle_info_msg (TDSCONTEXT *,
  55                                                         TDSSOCKET *,
  56 -                                                       TDSMSGINFO *);
  57 +                                                       TDSMESSAGE *);
  58    static int gda_freetds_provider_tds_handle_err_msg (TDSCONTEXT *,
  59                                                        TDSSOCKET *,
  60 -                                                      TDSMSGINFO *);
  61 +                                                      TDSMESSAGE *);
  62  #else
  63    static int gda_freetds_provider_tds_handle_info_msg (void *aStruct);
  64    static int gda_freetds_provider_tds_handle_err_msg (void *aStruct);
  65 @@ -359,7 +359,7 @@
  66         }
  67         if (tds_cnc->config) {
  68  #ifdef HAVE_FREETDS_VER0_6X
  69 -               tds_free_connect (tds_cnc->config);
  70 +               tds_free_connection (tds_cnc->config);
  71  #else
  72                 tds_free_config(tds_cnc->config);
  73  #endif
  74 @@ -664,7 +664,7 @@
  75                                 GdaParameterList *params)
  76  {
  77         GdaDataModel *model = NULL;
  78 -       TDSCOLINFO col;
  79 +       TDSCOLUMN col;
  80         GdaValueType gda_type;
  81         GdaValue     *value = NULL;
  82         gint i = 1;
  83 @@ -797,7 +797,7 @@
  84
  85         /* there should not be any result tokens */
  86  #ifdef HAVE_FREETDS_VER0_6X
  87 -       while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds, &tds_cnc->result_type))
  88 +       while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds, &tds_cnc->result_type, NULL))
  89  #else
  90         while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds))
  91  #endif
  92 @@ -1037,7 +1037,7 @@
  93                                                      const gboolean is_err_msg)
  94  {
  95         TDSSOCKET *tds = (TDSSOCKET *) aStruct;
  96 -       TDSMSGINFO *msg_info = (TDSMSGINFO *) bStruct;
  97 +       TDSMESSAGE *msg_info = (TDSMESSAGE *) bStruct;
  98         GdaConnection *cnc = NULL;
  99         GdaFreeTDSConnectionData *tds_cnc = NULL;
 100         GdaConnectionEvent *error = NULL;
 101 @@ -1093,7 +1093,7 @@
 102  /* FIXME: rewrite tds_handle_message as well/use new parameters here */
 103  static int
 104  gda_freetds_provider_tds_handle_info_msg (TDSCONTEXT *ctx, TDSSOCKET *tds,
 105 -                                          TDSMSGINFO *msg)
 106 +                                          TDSMESSAGE *msg)
 107  {
 108         return gda_freetds_provider_tds_handle_message ((void *) tds,
 109  #ifdef HAVE_FREETDS_VER0_6X
 110 @@ -1115,7 +1115,7 @@
 111  /* FIXME: rewrite tds_handle_message as well/use new parameters here */
 112  static int
 113  gda_freetds_provider_tds_handle_err_msg (TDSCONTEXT *ctx, TDSSOCKET *tds,
 114 -                                         TDSMSGINFO *msg)
 115 +                                         TDSMESSAGE *msg)
 116  {
 117         return gda_freetds_provider_tds_handle_message ((void *) tds,
 118  #ifdef HAVE_FREETDS_VER0_6X
 119 --- libgda-1.9.100/providers/freetds/gda-freetds-provider.h.orig        2003-09-17 13:05:03.000000000 +0200
 120 +++ libgda-1.9.100/providers/freetds/gda-freetds-provider.h     2005-10-20 11:29:54.000000000 +0200
 121 @@ -64,7 +64,7 @@
 122  #endif
 123         TDSSOCKET      *tds;       /* connection handle */
 124  #ifdef HAVE_FREETDS_VER0_6X
 125 -       TDSCONNECTINFO *config;    /* tds connect struct */
 126 +       TDSCONNECTION *config;    /* tds connect struct */
 127  #else
 128         TDSCONFIGINFO  *config;     /* tds config struct */
 129  #endif
 130 --- libgda-1.9.100/providers/freetds/gda-freetds-recordset.c.orig       2005-09-22 12:24:01.000000000 +0200
 131 +++ libgda-1.9.100/providers/freetds/gda-freetds-recordset.c    2005-10-20 11:30:46.000000000 +0200
 132 @@ -61,7 +61,7 @@
 133  /* Private utility functions */
 134
 135  /* w/o results */
 136 -static TDSCOLINFO *gda_freetds_dup_tdscolinfo (TDSCOLINFO *col);
 137 +static TDSCOLUMN *gda_freetds_dup_tdscolinfo (TDSCOLUMN *col);
 138  static GdaRow *gda_freetds_get_current_row(GdaFreeTDSRecordset *recset);
 139
 140  static gint
 141 @@ -165,7 +165,7 @@
 142                 }
 143                 if (recset->priv->columns) {
 144                         while (recset->priv->columns->len > 0) {
 145 -                               TDSCOLINFO *col = (TDSCOLINFO *) g_ptr_array_index (recset->priv->columns, 0);
 146 +                               TDSCOLUMN *col = (TDSCOLUMN *) g_ptr_array_index (recset->priv->columns, 0);
 147                                 if (col != NULL) {
 148                                         g_free (col);
 149                                         col = NULL;
 150 @@ -203,7 +203,7 @@
 151
 152         for (i = 0; i < recset->priv->res->num_cols; i++) {
 153                 GdaValue   *field;
 154 -               TDSCOLINFO *col;
 155 +               TDSCOLUMN *col;
 156
 157                 field = gda_row_get_value (row, i);
 158                 col = recset->priv->res->columns[i];
 159 @@ -216,16 +216,16 @@
 160         return row;
 161  }
 162
 163 -static TDSCOLINFO *
 164 -gda_freetds_dup_tdscolinfo (TDSCOLINFO *col)
 165 +static TDSCOLUMN *
 166 +gda_freetds_dup_tdscolinfo (TDSCOLUMN *col)
 167  {
 168 -       TDSCOLINFO *copy = NULL;
 169 +       TDSCOLUMN *copy = NULL;
 170
 171         g_return_val_if_fail (col != NULL, NULL);
 172
 173 -       copy = g_new0(TDSCOLINFO, 1);
 174 +       copy = g_new0(TDSCOLUMN, 1);
 175         if (copy) {
 176 -               memcpy(copy, col, sizeof(TDSCOLINFO));
 177 +               memcpy(copy, col, sizeof(TDSCOLUMN));
 178
 179                 /* set pointers to NULL */
 180                 copy->column_nullbind = NULL;
 181 @@ -271,7 +271,7 @@
 182  gda_freetds_recordset_describe_column (GdaDataModel *model, gint col)
 183  {
 184         GdaFreeTDSRecordset *recset = (GdaFreeTDSRecordset *) model;
 185 -       TDSCOLINFO          *colinfo = NULL;
 186 +       TDSCOLUMN          *colinfo = NULL;
 187         GdaColumn           *attribs;
 188         gchar               name[256];
 189
 190 @@ -280,7 +280,7 @@
 191         g_return_if_fail (recset->priv->columns != NULL);
 192         g_return_if_fail (col < recset->priv->columns->len);
 193
 194 -       colinfo = (TDSCOLINFO *) g_ptr_array_index (recset->priv->columns, col);
 195 +       colinfo = (TDSCOLUMN *) g_ptr_array_index (recset->priv->columns, col);
 196         g_return_if_fail (colinfo);
 197
 198         attribs = gda_data_model_describe_column (model, col);
 199 @@ -311,7 +311,7 @@
 200  {
 201         GdaFreeTDSConnectionData *tds_cnc = NULL;
 202         GdaFreeTDSRecordset *recset = NULL;
 203 -       TDSCOLINFO *col = NULL;
 204 +       TDSCOLUMN *col = NULL;
 205         GdaRow *row = NULL;
 206         GdaConnectionEvent *error = NULL;
 207         gboolean columns_set = FALSE;
 208 @@ -330,7 +330,7 @@
 209
 210  #ifdef HAVE_FREETDS_VER0_6X
 211         while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds,
 212 -                                                        &tds_cnc->result_type))
 213 +                                                        &tds_cnc->result_type, NULL))
 214                == TDS_SUCCEED) {
 215                 if (tds_cnc->result_type == TDS_ROW_RESULT) {
 216                         gint row_type, compute_id;
 217 --- libgda-1.9.100/providers/freetds/gda-freetds-types.c.orig   2005-09-16 11:55:02.000000000 +0200
 218 +++ libgda-1.9.100/providers/freetds/gda-freetds-types.c        2005-10-20 11:31:00.000000000 +0200
 219 @@ -35,7 +35,7 @@
 220  static void
 221  gda_freetds_set_gdavalue_by_datetime (GdaValue     *field,
 222                                        TDS_DATETIME *dt,
 223 -                                      TDSCOLINFO   *col
 224 +                                      TDSCOLUMN   *col
 225                                       )
 226  {
 227         GDate        date;
 228 @@ -82,7 +82,7 @@
 229  static void
 230  gda_freetds_set_gdavalue_by_datetime4 (GdaValue      *field,
 231                                         TDS_DATETIME4 *dt4,
 232 -                                       TDSCOLINFO    *col
 233 +                                       TDSCOLUMN    *col
 234                                        )
 235  {
 236         GDate        date;
 237 @@ -123,7 +123,7 @@
 238   */
 239
 240  const GdaValueType
 241 -gda_freetds_get_value_type (TDSCOLINFO *col)
 242 +gda_freetds_get_value_type (TDSCOLUMN *col)
 243  {
 244         g_return_val_if_fail (col != NULL, GDA_VALUE_TYPE_UNKNOWN);
 245
 246 @@ -185,7 +185,7 @@
 247
 248
 249  void
 250 -gda_freetds_set_gdavalue (GdaValue *field, gchar *val, TDSCOLINFO *col,
 251 +gda_freetds_set_gdavalue (GdaValue *field, gchar *val, TDSCOLUMN *col,
 252                           GdaFreeTDSConnectionData *tds_cnc)
 253  {
 254         const TDS_INT max_size = 255;
 255 --- libgda-1.9.100/providers/freetds/gda-freetds-types.h.orig   2003-01-16 01:10:30.000000000 +0100
 256 +++ libgda-1.9.100/providers/freetds/gda-freetds-types.h        2005-10-20 11:31:11.000000000 +0200
 257 @@ -34,9 +34,9 @@
 258
 259  G_BEGIN_DECLS
 260
 261 -void gda_freetds_set_gdavalue (GdaValue *field, gchar *val, TDSCOLINFO *col,
 262 +void gda_freetds_set_gdavalue (GdaValue *field, gchar *val, TDSCOLUMN *col,
 263                                 GdaFreeTDSConnectionData *tds_cnc);
 264 -const GdaValueType gda_freetds_get_value_type (TDSCOLINFO *col);
 265 +const GdaValueType gda_freetds_get_value_type (TDSCOLUMN *col);
 266
 267
 268  G_END_DECLS