revert merge errors

Author: arw2019

pandas/io/pytables.py

@@ -3025,6 +3025,8 @@ def write_array(self, key: str, obj, items: Optional[Index] = None):
             vlarr = self._handle.create_vlarray(self.group, key, _tables().ObjectAtom())
             vlarr.append(value)
 
+        elif empty_array:
+            self.write_array_empty(key, value)
         elif is_datetime64_dtype(value.dtype):
             self._handle.create_array(self.group, key, value.view("i8"))
             getattr(self.group, key)._v_attrs.value_type = "datetime64"
@@ -3039,8 +3041,6 @@ def write_array(self, key: str, obj, items: Optional[Index] = None):
         elif is_timedelta64_dtype(value.dtype):
             self._handle.create_array(self.group, key, value.view("i8"))
             getattr(self.group, key)._v_attrs.value_type = "timedelta64"
-        elif empty_array:
-            self.write_array_empty(key, value)
         else:
             self._handle.create_array(self.group, key, value)
 
@@ -4734,8 +4734,13 @@ def _set_tz(
         assert values.tz is None or values.tz == tz
 
     if tz is not None:
-        name = getattr(values, "name", None)
-        values = values.ravel()
+        if isinstance(values, DatetimeIndex):
+            name = values.name
+            values = values.asi8
+        else:
+            name = None
+            values = values.ravel()
+
         tz = _ensure_decoded(tz)
         values = DatetimeIndex(values, name=name)
         values = values.tz_localize("UTC").tz_convert(tz)