fix_join_tables_and_series_column_rename

Signed-off-by: Paweł Mróz <[email protected]>

Author: mrozpawel

nzpyida/frame.py

@@ -355,7 +355,7 @@ def columns(self, new_names):
 
     @columns.deleter
     def columns(self):
-        pass
+        self._reset_attributes(['get_columns'])
 
     @lazy
     def org_columns_names(self):

nzpyida/geo_series.py

@@ -1813,7 +1813,7 @@ def _unary_operation_handler(self, function_name,
         idaseries.internal_state.update()
 
         # Set the column attribute of the new idaseries
-        idaseries.column = result_column_key
+        idaseries._column = result_column_key
 
         try:
             del(idaseries.columns)

nzpyida/join_tables.py

@@ -67,7 +67,7 @@ def concat(objs: List[IdaDataFrame], axis: int=0, join: str='outer', keys: List[
         else:
             case_statments = [""] * len(objs)
         if all(list(obj.columns) == list(objs[0].columns) for obj in objs):
-            names_list = [df.internal_state.current_state for df in objs]
+            names_list = [f'{objs[i].internal_state.get_state()} AS TEMP_JOIN_{i} ' for i in range(len(objs))]
             query = "SELECT * FROM " + " UNION ALL SELECT * FROM ".join(names_list)
         else:
             in_columns_table = [obj.columns for obj in objs]
@@ -86,7 +86,7 @@ def concat(objs: List[IdaDataFrame], axis: int=0, join: str='outer', keys: List[
 
             columns_queries = ['SELECT ' + case_statments[i] + 
                                 ', '.join(out_columns_table[i]) + 
-                                f" FROM {objs[i].internal_state.current_state}" 
+                                f" FROM ({objs[i].internal_state.get_state()}) AS TEMP_{i}" 
                                 for i in range(len(objs))
                                ]
             query = " UNION ALL ".join(columns_queries)
@@ -298,20 +298,20 @@ def merge(left: IdaDataFrame, right: IdaDataFrame, how: str='inner', on=None,
     if indicator:
         case_statement = ", case when t1=1 and t2=1 then 'both' when t1=1 then 'left_only'" + \
             "else 'right_only' end as indicator"
-        select_statement1 = "(select 1 as t1, * from "
-        select_statement2 = "(select 1 as t2, * from "
-        as_statement1 = ") as left_table "
-        as_statement2 = ") as right_table "
+        select_statement1 = "(select 1 as t1, * from ("
+        select_statement2 = "(select 1 as t2, * from ("
+        as_statement1 = ") as lt) as left_table "
+        as_statement2 = ") as rt) as right_table "
     else:
         case_statement = ""
-        select_statement1 = ""
-        select_statement2 = ""
-        as_statement1 = " as left_table"
-        as_statement2 = " as right_table"
+        select_statement1 = "("
+        select_statement2 = "("
+        as_statement1 = ") as left_table"
+        as_statement2 = ") as right_table"
     query = f"select {nvl_statement} {cols} {case_statement} from" + \
-        f"{select_statement1} {left.internal_state.current_state}{as_statement1}" + \
+        f"{select_statement1} ({left.internal_state.get_state()}){as_statement1}" + \
         f" {join_type[how]} join {select_statement2}" + \
-        f"{right.internal_state.current_state}{as_statement2}" + on_query
+        f"{right.internal_state.get_state()}{as_statement2}" + on_query
 
     if how == 'right':
         idx = right_indexer

nzpyida/series.py

@@ -40,9 +40,10 @@ def column(self):
 
     @column.setter
     def column(self, value):
+        new_columndict = {value: self.internal_state.columndict[self._column]}
         self._reset_attributes('columns')
         self._column = value
-        #self.columndict = {value: self._org_columns_names[0]}
+        self.internal_state.columndict = new_columndict
         self.internal_state.update()
 
     @lazy