Index: bookingsapi.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/bookingsapi/bookingsapi.install,v
retrieving revision 1.8
diff -u -p -r1.8 bookingsapi.install
--- bookingsapi.install	23 Apr 2009 14:05:48 -0000	1.8
+++ bookingsapi.install	15 May 2009 11:07:58 -0000
@@ -143,7 +143,7 @@ function bookingsapi_schema() {
         'not null' => TRUE,
         'description' => t('Parent resource. The unavailabilities of a parent also apply to its children.'),
       ),
-      'group' => array(
+      'grouping' => array(
         'type' => 'int',
         'size' => 'tiny',
         'unsigned' => TRUE,
@@ -298,3 +298,21 @@ function bookingsapi_update_6001() {
 
 	return $ret;
 }
+
+/*
+ Change bookings_resources column "group" to "grouping" to avoid columnnames identical to keywords
+ */
+function bookingsapi_update_6002() {
+  $ret = array();
+  if (db_column_exists('bookings_resources','group')) {
+    db_change_field($ret, 'bookings_resources', '`group`', 'grouping', array(
+        'type' => 'int',
+        'size' => 'tiny',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'description' => t(''),
+      )
+    );
+  }
+  return $ret;
+}
Index: bookingsapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/bookingsapi/bookingsapi.module,v
retrieving revision 1.16
diff -u -p -r1.16 bookingsapi.module
--- bookingsapi.module	7 Apr 2009 14:26:44 -0000	1.16
+++ bookingsapi.module	15 May 2009 09:53:41 -0000
@@ -737,6 +737,7 @@ function bookingsapi_resource_save(&$res
   $update = empty($resource['resource_id']) ? array() : 'resource_id';
   bookingsapi_extend('bookingsapi_resource', $op, $resource);
   $retval = drupal_write_record('bookings_resources', $resource, $update);
+  if (!array_key_exists('grouping',$resource)){ $resource['grouping'] = 0; }
   if (!$return_object) {
     $resource = (array) $resource;
   }