PHOENIX-6917 Column alias not working properly in Python

Co-authored-by: Istvan Toth <[email protected]>

Author: satyakommula96

phoenix-queryserver/pom.xml

@@ -251,6 +251,7 @@
     <profile>
       <!-- This is required for operation with Phoenix 5.1.0 - 5.1.3 and 4.16.x -->
       <!-- See PHOENIX-6861 -->
+      <!-- This should have been called relocate-java-servlet -->
       <id>shade-javax-servlet</id>
       <activation>
         <property>

python-phoenixdb/NEWS.rst

@@ -12,6 +12,7 @@ Unreleased
 - Run tests with all supported Python + SqlAlchemy versions (1.3, 1.4, 2.0) (PHOENIX-6892)
 - Replace deprecated failUnless methods in tests (PHOENIX-6892)
 - Add support for specifying custom HTTP headers (PHOENIX-6921)
+- Use JDBC/Avatica column label as column name when set (PHOENIX-6917)
 
 Version 1.2.1
 -------------

python-phoenixdb/phoenixdb/cursor.py

@@ -115,7 +115,7 @@ def description(self):
         description = []
         for column in self._signature.columns:
             description.append(ColumnDescription(
-                column.column_name,
+                self._get_column_name(column),
                 column.type.name,
                 column.display_size,
                 None,
@@ -125,6 +125,13 @@ def description(self):
             ))
         return description
 
+    def _get_column_name(self, column):
+        if column.label:
+            # Not empty
+            return column.label
+        else:
+            return column.column_name
+
     def _set_id(self, id):
         if self._id is not None and self._id != id:
             self._connection._client.close_statement(self._connection._id, self._id)
@@ -386,5 +393,5 @@ def _transform_row(self, row):
         row = super(DictCursor, self)._transform_row(row)
         d = {}
         for ind, val in enumerate(row):
-            d[self._signature.columns[ind].column_name] = val
+            d[self._get_column_name(self._signature.columns[ind])] = val
         return d

python-phoenixdb/phoenixdb/tests/dbapi20.py

@@ -32,6 +32,7 @@
 import unittest
 import time
 import sys
+import phoenixdb
 
 def str2bytes(sval):
     if sys.version_info < (3,0) and isinstance(sval, str):
@@ -74,7 +75,7 @@ class mytest(dbapi20.DatabaseAPI20Test):
     insert = 'insert'
 
     lowerfunc = 'lower' # Name of stored procedure to convert string->lowercase
-        
+
     # Some drivers may need to override these helpers, for example adding
     # a 'commit' after the execute.
     def executeDDL1(self,cursor):
@@ -208,7 +209,7 @@ def test_rollback(self):
                 con.rollback()
             except self.driver.NotSupportedError:
                 pass
-    
+
     def test_cursor(self):
         con = self._connect()
         try:
@@ -399,12 +400,12 @@ def _paraminsert(self,cur):
         trouble = "thi%s :may ca%(u)se? troub:1e"
         self.assertEqual(res[0][1], trouble,
             'cursor.fetchall retrieved incorrect data, or data inserted '
-            'incorrectly. Got=%s, Expected=%s' % (repr(res[0][1]), repr(trouble)))      
+            'incorrectly. Got=%s, Expected=%s' % (repr(res[0][1]), repr(trouble)))
         self.assertEqual(res[1][1], trouble,
             'cursor.fetchall retrieved incorrect data, or data inserted '
             'incorrectly. Got=%s, Expected=%s' % (repr(res[1][1]), repr(trouble)
             ))
-        
+
     def test_executemany(self):
         con = self._connect()
         try:
@@ -575,7 +576,7 @@ def test_fetchmany(self):
             self.assertEqual(len(rows),6)
             rows = [r[0] for r in rows]
             rows.sort()
-          
+
             # Make sure we get the right data back out
             for i in range(0,6):
                 self.assertEqual(rows[i],self.samples[i],
@@ -646,10 +647,10 @@ def test_fetchall(self):
                 'cursor.fetchall should return an empty list if '
                 'a select query returns no rows'
                 )
-            
+
         finally:
             con.close()
-    
+
     def test_mixedfetch(self):
         con = self._connect()
         try:
@@ -832,3 +833,17 @@ def test_ROWID(self):
         self.assertTrue(hasattr(self.driver,'ROWID'),
             'module.ROWID must be defined.'
             )
+
+    # https://issues.apache.org/jira/browse/PHOENIX-6917
+    def test_alias(self):
+        con = self._connect()
+        try:
+            cur = con.cursor(cursor_factory=phoenixdb.cursor.DictCursor)
+            self.executeDDL1(cur)
+            for sql in self._populate():
+                cur.execute(sql)
+            cur.execute('select name as beverages from %sbooze' % self.table_prefix)
+            self.assertEqual(cur.description[0][0], 'BEVERAGES')
+            self.assertEqual(cur.fetchone()['BEVERAGES'], 'Carlton Cold')
+        finally:
+            con.close()