Skip to content

Hd121024 pydbapi 81 py td#126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
htackett wants to merge 5 commits into
base:master
Choose a base branch
from
Open

Hd121024 pydbapi 81 py td #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a2d917
pydbapi-81
htackett Dec 4, 2020
2362e8b
pydbapi-81
htackett Dec 11, 2020
4319edb
hd121024_pydbapi-81-PyTd
htackett Dec 11, 2020
930e9a1
hd121024_pydbapi-81-PyTd
htackett Dec 12, 2020
b6a2719
hd121024_pydbapi-81-PyTd
htackett Dec 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,118 changes: 1,103 additions & 15 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions setup.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,17 @@
# The MIT License (MIT)
#
# Copyright (c) 2015 by Teradata
#
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All@@ -24,19 +24,21 @@
from setuptools import setup

# Make sure correct version of python is being used.
if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 7):
print("The teradata module does not support this version of Python, the version must be 2.7 or later.")
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 4):
print("The teradata module does not support this version of Python, the version must be 3.4 or later.")
sys.exit(1)
with open('teradata/version.py') as f:

with open('teradata/version.py') as f:
exec(f.read())

setup(name='teradata',
version=__version__, # @UndefinedVariable
author = 'Teradata Corporation',
description='The Teradata python module for DevOps enabled SQL scripting for Teradata UDA.',
url='http://github.com/teradata/PyTd',
author='Teradata Corporation',
author_email='eric.scheie@teradata.com',
license='MIT',
packages=['teradata'],
install_requires=['teradatasql'],
platforms = ['Windows', 'MacOS X', 'Linux'],
python_requires = '>=3.4',
zip_safe=True)
52 changes: 51 additions & 1 deletion teradata/api.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,24 @@ def emit(self, record):

logging.getLogger("teradata").addHandler(NullHandler())

class InParam ():

"""Represents an input parameter from a Stored Procedure"""

def __init__(self, value, dataType=None, size=None):
self.inValue = value
self.dataType = dataType
self.size = size
self.escapeParamType = determineEscapeParamType (dataType, value)

def setValueFunc(self, valueFunc):
self.valueFunc = valueFunc

def value(self):
return None if self.valueFunc is None else self.valueFunc()

def __repr__(self):
return "InParam(value={}, dataType={})".format(self.inValue, self.dataType)

class OutParam ():

Expand DownExpand Up@@ -70,14 +88,44 @@ class InOutParam (OutParam):
def __init__(self, value, name=None, dataType=None, size=None):
OutParam.__init__(self, name, dataType, size)
self.inValue = value
self.escapeParamType = determineEscapeParamType (dataType, value)

def __repr__(self):
return "InOutParam(value={}, name={}, dataType={}, size={})".format(
self.inValue, self.name, self.dataType, self.size)

# Define exceptions
def determineEscapeParamType (datatype, value):
from .datatypes import Interval, Period

if datatype is None or value is None:
return datatype

if datatype.endswith ("AS LOCATOR") and isinstance (value, (bytes, bytearray)):
return datatype

if datatype.startswith (("BYTE", "VARBYTE", "LONG VARBYTE")) and isinstance (value, (bytes, bytearray)):
return datatype

if datatype in {"BYTEINT", "BIGINT", "INTEGER", "SMALLINT", "INT"} and isinstance (value, int):
return datatype

if datatype.startswith(("INTERVAL", "PERIOD", "DATE", "VARCHAR", "CHAR", "FLOAT", "NUMBER", "DECIMAL", "XML", "LONG VARCHAR")) and isinstance (value, str):
return datatype

if datatype.startswith ("INTERVAL") and isinstance (value, Interval):
return datatype

if datatype.startswith ("PERIOD") and isinstance (value, Period):
return datatype

if datatype.startswith ("TIME"):
return datatype

return None
#end determineEscapeParamType


# Define exceptions
class Warning(Exception): # @ReservedAssignment

def __init__(self, msg):
Expand DownExpand Up@@ -124,6 +172,7 @@ def __init__(self, code, msg):
class ProgrammingError(DatabaseError):

def __init__(self, code, msg):
DatabaseError.__init__(self, code, msg)
self.value = (code, msg)
self.args = (code, msg)

Expand DownExpand Up@@ -152,6 +201,7 @@ def __init__(self, code, msg):
class OperationalError(DatabaseError):

def __init__(self, code, msg):
DatabaseError.__init__(self, code, msg)
self.value = (code, msg)
self.args = (code, msg)

Expand Down
90 changes: 62 additions & 28 deletions teradata/datatypes.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,12 @@
hourToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+):(\d+\.?\d*)$")
minuteToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+\.?\d*)$")
secondIntervalRegEx = re.compile("^(-?)(\d+\.?\d*)$")
periodRegEx1 = re.compile("\('(.*)',\s*'(.*)'\)")
periodRegEx2 = re.compile("ResultStruct:PERIOD\(.*\)\[(.*),\s*(.*)\]")
periodRegEx = re.compile("(.*),\s*(.*)")

T_BLOB_AS_LOCATOR = 408
T_CLOB_AS_LOCATOR = 424
T_JSON_AS_LOCATOR = 884
T_XML_AS_LOCATOR = 860

NUMBER_TYPES = {"BYTEINT", "BIGINT", "DECIMAL", "DOUBLE", "DOUBLE PRECISION",
"INTEGER", "NUMBER", "SMALLINT", "FLOAT", "INT", "NUMERIC",
Expand All@@ -55,8 +59,14 @@

FLOAT_TYPES = {"FLOAT", "DOUBLE", "DOUBLE PRECISION", "REAL"}

BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE"}
BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE", "LONG VARBYTE"}

LOB_LOCATOR_TYPES = {
T_BLOB_AS_LOCATOR : "BLOB AS LOCATOR",
T_CLOB_AS_LOCATOR : "CLOB AS LOCATOR",
T_JSON_AS_LOCATOR : "JSON AS LOCATOR",
T_XML_AS_LOCATOR : "XML AS LOCATOR"
}

def _getMs(m, num):
ms = m.group(num)
Expand DownExpand Up@@ -134,6 +144,7 @@ def _convertInterval(dataType, value, regEx, *args):

def convertInterval(dataType, value):
value = value.strip()
dataType = re.sub (" ?\(([0-9, ]+)\)", "", dataType)
if dataType == "INTERVAL YEAR":
return _convertScalarInterval(dataType, value, "years")
elif dataType == "INTERVAL YEAR TO MONTH":
Expand DownExpand Up@@ -172,9 +183,7 @@ def convertInterval(dataType, value):


def convertPeriod(dataType, value):
m = periodRegEx1.match(value)
if not m:
m = periodRegEx2.match(value)
m = periodRegEx.match(value)
if m:
if "TIMESTAMP" in dataType:
start = convertTimestamp(m.group(1))
Expand All@@ -187,13 +196,38 @@ def convertPeriod(dataType, value):
end = convertDate(m.group(2))
else:
raise InterfaceError("INVALID_PERIOD",
"Unknown PERIOD data type: {}".format(
"Unknown PERIOD data type: {} {}".format(
dataType, value))
else:
raise InterfaceError(
"INVALID_PERIOD", "{} format invalid: {}".format(dataType, value))
return Period(start, end)
#end convertPeriod

def removeTrailingZerosFromPeriod (value):
if value is None:
return value
m = re.compile("\('(.*)',\s*'(.*)'\)").match(str(value))
if m is not None and len (m.groups()) == 2:
value = "{},{}".format (removeTrailingZeros (m.group (1)), removeTrailingZeros (m.group (2)))
return value
#end convertInParamPeriod

def removeTrailingZerosFromTimeAndTimestamp (value):
if value is None:
return value
return removeTrailingZeros (str(value))

def removeTrailingZeros (value):
seconds = re.compile(".*(\.[0-9]*).*").match (str(value))

if seconds is not None:
sSecond = seconds.group (1).rstrip ('0')
sSecond = "" if len (sSecond) == 1 else sSecond
value = re.sub ('\.[0-9]*', sSecond, str(value))

return value
#end removeTrailingZeros

def zeroIfNone(value):
if value is None:
Expand All@@ -205,13 +239,13 @@ class DataTypeConverter:

"""Handles conversion of result set data types into python objects."""

def convertValue(self, dbType, dataType, typeCode, value):
def convertValue(self, dataType, typeCode, value):
"""Converts the value returned by the database into the desired
python object."""
raise NotImplementedError(
"convertValue must be implemented by sub-class")

def convertType(self, dbType, dataType):
def convertType(self, dataType):
"""Converts the data type to a python type code."""
raise NotImplementedError(
"convertType must be implemented by sub-class")
Expand All@@ -224,62 +258,59 @@ class DefaultDataTypeConverter (DataTypeConverter):
def __init__(self, useFloat=False):
self.useFloat = useFloat

def convertValue(self, dbType, dataType, typeCode, value):
def convertValue(self, dataType, typeCode, value):
"""Converts the value returned by the database into the desired
python object."""
logger.trace(
"Converting \"%s\" to (%s, %s).", value, dataType, typeCode)
if value is not None:
if typeCode == NUMBER:
try:
return NUMBER(value)
except:
# Handle infinity and NaN for older ODBC drivers.
if value == "1.#INF":
return NUMBER('Infinity')
elif value == "-1.#INF":
return NUMBER('-Infinity')
else:
return NUMBER('NaN')
return NUMBER(value)
elif typeCode == float:
return value if not util.isString else float(value)
return value if not isinstance(value, str) else float(value)
elif typeCode == Timestamp:
if util.isString(value):
if isinstance(value, str):
return convertTimestamp(value)
elif isinstance (value, datetime.date):
return (value)
else:
return datetime.datetime.fromtimestamp(
value // SECS_IN_MILLISECS).replace(
microsecond=value % SECS_IN_MILLISECS *
MILLISECS_IN_MICROSECS)
elif typeCode == Time:
if util.isString(value):
if isinstance(value, str):
return convertTime(value)
elif isinstance (value, datetime.time):
return (value)
else:
return datetime.datetime.fromtimestamp(
value // SECS_IN_MILLISECS).replace(
microsecond=value % SECS_IN_MILLISECS *
MILLISECS_IN_MICROSECS).time()
elif typeCode == Date:
if util.isString(value):
if isinstance(value, str):
return convertDate(value)
else:
elif isinstance (value, datetime.date):
return (value)
elif type (value) is int:
return datetime.datetime.fromtimestamp(
value // SECS_IN_MILLISECS).replace(
microsecond=value % SECS_IN_MILLISECS *
MILLISECS_IN_MICROSECS).date()
elif typeCode == BINARY:
if util.isString(value):
if isinstance(value, str):
return bytearray.fromhex(value)
elif dataType.startswith("INTERVAL"):
return convertInterval(dataType, value)
elif dataType.startswith("JSON") and util.isString(value):
elif dataType.startswith("JSON") and isinstance(value, str):
return json.loads(value, parse_int=decimal.Decimal,
parse_float=decimal.Decimal)
elif dataType.startswith("PERIOD"):
return convertPeriod(dataType, value)
return value

def convertType(self, dbType, dataType):
def convertType(self, dataType):
"""Converts the data type to a python type code."""
typeCode = STRING
if dataType in NUMBER_TYPES:
Expand DownExpand Up@@ -414,6 +445,8 @@ def __str__(self):
_appendInterval(s, self.seconds, separator=":")
if self.negative:
s.insert(0, "-")
else:
s.insert(0, " ")
return "".join(s)

def __repr__(self):
Expand All@@ -436,6 +469,7 @@ class Period:
def __init__(self, start, end):
self.start = start
self.end = end
s = "('" + str(start) + "', '" + str(end) + "')"

def __str__(self):
return "('" + str(self.start) + "', '" + str(self.end) + "')"
Expand Down
4 changes: 0 additions & 4 deletions teradata/pulljson.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
import json
import logging
from . import util # @UnusedImport # noqa
if sys.version_info[0] == 2:
from StringIO import StringIO # @UnresolvedImport #@UnusedImport
else:
from io import StringIO # @UnresolvedImport @UnusedImport @Reimport # noqa

logger = logging.getLogger(__name__)

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Hd121024 pydbapi 81 py td by htackett · Pull Request #126 · Teradata/PyTd · GitHub
Skip to content
Hd121024 pydbapi 81 py td#126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

htackett
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Hd121024 pydbapi 81 py td
#126
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1a2d917

pydbapi-81


htackett Dec 4, 2020
2362e8b

pydbapi-81


htackett Dec 11, 2020
4319edb

hd121024_pydbapi-81-PyTd


htackett Dec 11, 2020
930e9a1

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020
b6a2719

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1,118 changes: 1,103 additions & 15 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


20 changes: 11 additions & 9 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,17 @@
# The MIT License (MIT)
#
# Copyright (c) 2015 by Teradata
#
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All@@ -24,19 +24,21 @@
from setuptools import setup

# Make sure correct version of python is being used.
if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 7):
 print("The teradata module does not support this version of Python, the version must be 2.7 or later.")
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 4):
 print("The teradata module does not support this version of Python, the version must be 3.4 or later.")
 sys.exit(1)
with open('teradata/version.py') as f:

with open('teradata/version.py') as f:
 exec(f.read())

setup(name='teradata',
 version=__version__, # @UndefinedVariable
 author = 'Teradata Corporation',
 description='The Teradata python module for DevOps enabled SQL scripting for Teradata UDA.',
 url='http://github.com/teradata/PyTd',
 author='Teradata Corporation',
 author_email='eric.scheie@teradata.com',
 license='MIT',
 packages=['teradata'],
 install_requires=['teradatasql'],
 platforms = ['Windows', 'MacOS X', 'Linux'],
 python_requires = '>=3.4',
 zip_safe=True)

52 changes: 51 additions & 1 deletion
teradata/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,24 @@ def emit(self, record):

logging.getLogger("teradata").addHandler(NullHandler())

class InParam ():

 """Represents an input parameter from a Stored Procedure"""

 def __init__(self, value, dataType=None, size=None):
 self.inValue = value
 self.dataType = dataType
 self.size = size
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def setValueFunc(self, valueFunc):
 self.valueFunc = valueFunc

 def value(self):
 return None if self.valueFunc is None else self.valueFunc()

 def __repr__(self):
 return "InParam(value={}, dataType={})".format(self.inValue, self.dataType)

class OutParam ():

Expand DownExpand Up@@ -70,14 +88,44 @@ class InOutParam (OutParam):
 def __init__(self, value, name=None, dataType=None, size=None):
 OutParam.__init__(self, name, dataType, size)
 self.inValue = value
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def __repr__(self):
 return "InOutParam(value={}, name={}, dataType={}, size={})".format(
 self.inValue, self.name, self.dataType, self.size)

# Define exceptions
def determineEscapeParamType (datatype, value):
 from .datatypes import Interval, Period

 if datatype is None or value is None:
 return datatype

 if datatype.endswith ("AS LOCATOR") and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype.startswith (("BYTE", "VARBYTE", "LONG VARBYTE")) and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype in {"BYTEINT", "BIGINT", "INTEGER", "SMALLINT", "INT"} and isinstance (value, int):
 return datatype

 if datatype.startswith(("INTERVAL", "PERIOD", "DATE", "VARCHAR", "CHAR", "FLOAT", "NUMBER", "DECIMAL", "XML", "LONG VARCHAR")) and isinstance (value, str):
 return datatype

 if datatype.startswith ("INTERVAL") and isinstance (value, Interval):
 return datatype

 if datatype.startswith ("PERIOD") and isinstance (value, Period):
 return datatype

 if datatype.startswith ("TIME"):
 return datatype

 return None
 #end determineEscapeParamType


# Define exceptions
class Warning(Exception): # @ReservedAssignment

 def __init__(self, msg):
Expand DownExpand Up@@ -124,6 +172,7 @@ def __init__(self, code, msg):
class ProgrammingError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand DownExpand Up@@ -152,6 +201,7 @@ def __init__(self, code, msg):
class OperationalError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand Down

90 changes: 62 additions & 28 deletions
teradata/datatypes.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,12 @@
hourToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+):(\d+\.?\d*)$")
minuteToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+\.?\d*)$")
secondIntervalRegEx = re.compile("^(-?)(\d+\.?\d*)$")
periodRegEx1 = re.compile("\('(.*)',\s*'(.*)'\)")
periodRegEx2 = re.compile("ResultStruct:PERIOD\(.*\)\[(.*),\s*(.*)\]")
periodRegEx = re.compile("(.*),\s*(.*)")

T_BLOB_AS_LOCATOR = 408
T_CLOB_AS_LOCATOR = 424
T_JSON_AS_LOCATOR = 884
T_XML_AS_LOCATOR = 860

NUMBER_TYPES = {"BYTEINT", "BIGINT", "DECIMAL", "DOUBLE", "DOUBLE PRECISION",
 "INTEGER", "NUMBER", "SMALLINT", "FLOAT", "INT", "NUMERIC",
Expand All@@ -55,8 +59,14 @@

FLOAT_TYPES = {"FLOAT", "DOUBLE", "DOUBLE PRECISION", "REAL"}

BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE"}
BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE", "LONG VARBYTE"}

LOB_LOCATOR_TYPES = {
 T_BLOB_AS_LOCATOR : "BLOB AS LOCATOR",
 T_CLOB_AS_LOCATOR : "CLOB AS LOCATOR",
 T_JSON_AS_LOCATOR : "JSON AS LOCATOR",
 T_XML_AS_LOCATOR : "XML AS LOCATOR"
}

def _getMs(m, num):
 ms = m.group(num)
Expand DownExpand Up@@ -134,6 +144,7 @@ def _convertInterval(dataType, value, regEx, *args):

def convertInterval(dataType, value):
 value = value.strip()
 dataType = re.sub (" ?\(([0-9, ]+)\)", "", dataType)
 if dataType == "INTERVAL YEAR":
 return _convertScalarInterval(dataType, value, "years")
 elif dataType == "INTERVAL YEAR TO MONTH":
Expand DownExpand Up@@ -172,9 +183,7 @@ def convertInterval(dataType, value):


def convertPeriod(dataType, value):
 m = periodRegEx1.match(value)
 if not m:
 m = periodRegEx2.match(value)
 m = periodRegEx.match(value)
 if m:
 if "TIMESTAMP" in dataType:
 start = convertTimestamp(m.group(1))
Expand All@@ -187,13 +196,38 @@ def convertPeriod(dataType, value):
 end = convertDate(m.group(2))
 else:
 raise InterfaceError("INVALID_PERIOD",
 "Unknown PERIOD data type: {}".format(
 "Unknown PERIOD data type: {} {}".format(
 dataType, value))
 else:
 raise InterfaceError(
 "INVALID_PERIOD", "{} format invalid: {}".format(dataType, value))
 return Period(start, end)
 #end convertPeriod

def removeTrailingZerosFromPeriod (value):
 if value is None:
 return value
 m = re.compile("\('(.*)',\s*'(.*)'\)").match(str(value))
 if m is not None and len (m.groups()) == 2:
 value = "{},{}".format (removeTrailingZeros (m.group (1)), removeTrailingZeros (m.group (2)))
 return value
 #end convertInParamPeriod

def removeTrailingZerosFromTimeAndTimestamp (value):
 if value is None:
 return value
 return removeTrailingZeros (str(value))

def removeTrailingZeros (value):
 seconds = re.compile(".*(\.[0-9]*).*").match (str(value))

 if seconds is not None:
 sSecond = seconds.group (1).rstrip ('0')
 sSecond = "" if len (sSecond) == 1 else sSecond
 value = re.sub ('\.[0-9]*', sSecond, str(value))

 return value
 #end removeTrailingZeros

def zeroIfNone(value):
 if value is None:
Expand All@@ -205,13 +239,13 @@ class DataTypeConverter:

 """Handles conversion of result set data types into python objects."""

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 raise NotImplementedError(
 "convertValue must be implemented by sub-class")

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 raise NotImplementedError(
 "convertType must be implemented by sub-class")
Expand All@@ -224,62 +258,59 @@ class DefaultDataTypeConverter (DataTypeConverter):
 def __init__(self, useFloat=False):
 self.useFloat = useFloat

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 logger.trace(
 "Converting \"%s\" to (%s, %s).", value, dataType, typeCode)
 if value is not None:
 if typeCode == NUMBER:
 try:
 return NUMBER(value)
 except:
 # Handle infinity and NaN for older ODBC drivers.
 if value == "1.#INF":
 return NUMBER('Infinity')
 elif value == "-1.#INF":
 return NUMBER('-Infinity')
 else:
 return NUMBER('NaN')
 return NUMBER(value)
 elif typeCode == float:
 return value if not util.isString else float(value)
 return value if not isinstance(value, str) else float(value)
 elif typeCode == Timestamp:
 if util.isString(value):
 if isinstance(value, str):
 return convertTimestamp(value)
 elif isinstance (value, datetime.date):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS)
 elif typeCode == Time:
 if util.isString(value):
 if isinstance(value, str):
 return convertTime(value)
 elif isinstance (value, datetime.time):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).time()
 elif typeCode == Date:
 if util.isString(value):
 if isinstance(value, str):
 return convertDate(value)
 else:
 elif isinstance (value, datetime.date):
 return (value)
 elif type (value) is int:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).date()
 elif typeCode == BINARY:
 if util.isString(value):
 if isinstance(value, str):
 return bytearray.fromhex(value)
 elif dataType.startswith("INTERVAL"):
 return convertInterval(dataType, value)
 elif dataType.startswith("JSON") and util.isString(value):
 elif dataType.startswith("JSON") and isinstance(value, str):
 return json.loads(value, parse_int=decimal.Decimal,
 parse_float=decimal.Decimal)
 elif dataType.startswith("PERIOD"):
 return convertPeriod(dataType, value)
 return value

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 typeCode = STRING
 if dataType in NUMBER_TYPES:
Expand DownExpand Up@@ -414,6 +445,8 @@ def __str__(self):
 _appendInterval(s, self.seconds, separator=":")
 if self.negative:
 s.insert(0, "-")
 else:
 s.insert(0, " ")
 return "".join(s)

 def __repr__(self):
Expand All@@ -436,6 +469,7 @@ class Period:
 def __init__(self, start, end):
 self.start = start
 self.end = end
 s = "('" + str(start) + "', '" + str(end) + "')"

 def __str__(self):
 return "('" + str(self.start) + "', '" + str(self.end) + "')"
Expand Down

4 changes: 0 additions & 4 deletions
teradata/pulljson.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
import json
import logging
from . import util # @UnusedImport # noqa
if sys.version_info[0] == 2:
 from StringIO import StringIO # @UnresolvedImport #@UnusedImport
else:
 from io import StringIO # @UnresolvedImport @UnusedImport @Reimport # noqa

logger = logging.getLogger(__name__)

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Hd121024 pydbapi 81 py td by htackett · Pull Request #126 · Teradata/PyTd · GitHub
Skip to content
Hd121024 pydbapi 81 py td#126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

htackett
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Hd121024 pydbapi 81 py td
#126
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1a2d917

pydbapi-81


htackett Dec 4, 2020
2362e8b

pydbapi-81


htackett Dec 11, 2020
4319edb

hd121024_pydbapi-81-PyTd


htackett Dec 11, 2020
930e9a1

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020
b6a2719

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1,118 changes: 1,103 additions & 15 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


20 changes: 11 additions & 9 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,17 @@
# The MIT License (MIT)
#
# Copyright (c) 2015 by Teradata
#
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All@@ -24,19 +24,21 @@
from setuptools import setup

# Make sure correct version of python is being used.
if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 7):
 print("The teradata module does not support this version of Python, the version must be 2.7 or later.")
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 4):
 print("The teradata module does not support this version of Python, the version must be 3.4 or later.")
 sys.exit(1)
with open('teradata/version.py') as f:

with open('teradata/version.py') as f:
 exec(f.read())

setup(name='teradata',
 version=__version__, # @UndefinedVariable
 author = 'Teradata Corporation',
 description='The Teradata python module for DevOps enabled SQL scripting for Teradata UDA.',
 url='http://github.com/teradata/PyTd',
 author='Teradata Corporation',
 author_email='eric.scheie@teradata.com',
 license='MIT',
 packages=['teradata'],
 install_requires=['teradatasql'],
 platforms = ['Windows', 'MacOS X', 'Linux'],
 python_requires = '>=3.4',
 zip_safe=True)

52 changes: 51 additions & 1 deletion
teradata/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,24 @@ def emit(self, record):

logging.getLogger("teradata").addHandler(NullHandler())

class InParam ():

 """Represents an input parameter from a Stored Procedure"""

 def __init__(self, value, dataType=None, size=None):
 self.inValue = value
 self.dataType = dataType
 self.size = size
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def setValueFunc(self, valueFunc):
 self.valueFunc = valueFunc

 def value(self):
 return None if self.valueFunc is None else self.valueFunc()

 def __repr__(self):
 return "InParam(value={}, dataType={})".format(self.inValue, self.dataType)

class OutParam ():

Expand DownExpand Up@@ -70,14 +88,44 @@ class InOutParam (OutParam):
 def __init__(self, value, name=None, dataType=None, size=None):
 OutParam.__init__(self, name, dataType, size)
 self.inValue = value
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def __repr__(self):
 return "InOutParam(value={}, name={}, dataType={}, size={})".format(
 self.inValue, self.name, self.dataType, self.size)

# Define exceptions
def determineEscapeParamType (datatype, value):
 from .datatypes import Interval, Period

 if datatype is None or value is None:
 return datatype

 if datatype.endswith ("AS LOCATOR") and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype.startswith (("BYTE", "VARBYTE", "LONG VARBYTE")) and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype in {"BYTEINT", "BIGINT", "INTEGER", "SMALLINT", "INT"} and isinstance (value, int):
 return datatype

 if datatype.startswith(("INTERVAL", "PERIOD", "DATE", "VARCHAR", "CHAR", "FLOAT", "NUMBER", "DECIMAL", "XML", "LONG VARCHAR")) and isinstance (value, str):
 return datatype

 if datatype.startswith ("INTERVAL") and isinstance (value, Interval):
 return datatype

 if datatype.startswith ("PERIOD") and isinstance (value, Period):
 return datatype

 if datatype.startswith ("TIME"):
 return datatype

 return None
 #end determineEscapeParamType


# Define exceptions
class Warning(Exception): # @ReservedAssignment

 def __init__(self, msg):
Expand DownExpand Up@@ -124,6 +172,7 @@ def __init__(self, code, msg):
class ProgrammingError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand DownExpand Up@@ -152,6 +201,7 @@ def __init__(self, code, msg):
class OperationalError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand Down

90 changes: 62 additions & 28 deletions
teradata/datatypes.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,12 @@
hourToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+):(\d+\.?\d*)$")
minuteToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+\.?\d*)$")
secondIntervalRegEx = re.compile("^(-?)(\d+\.?\d*)$")
periodRegEx1 = re.compile("\('(.*)',\s*'(.*)'\)")
periodRegEx2 = re.compile("ResultStruct:PERIOD\(.*\)\[(.*),\s*(.*)\]")
periodRegEx = re.compile("(.*),\s*(.*)")

T_BLOB_AS_LOCATOR = 408
T_CLOB_AS_LOCATOR = 424
T_JSON_AS_LOCATOR = 884
T_XML_AS_LOCATOR = 860

NUMBER_TYPES = {"BYTEINT", "BIGINT", "DECIMAL", "DOUBLE", "DOUBLE PRECISION",
 "INTEGER", "NUMBER", "SMALLINT", "FLOAT", "INT", "NUMERIC",
Expand All@@ -55,8 +59,14 @@

FLOAT_TYPES = {"FLOAT", "DOUBLE", "DOUBLE PRECISION", "REAL"}

BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE"}
BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE", "LONG VARBYTE"}

LOB_LOCATOR_TYPES = {
 T_BLOB_AS_LOCATOR : "BLOB AS LOCATOR",
 T_CLOB_AS_LOCATOR : "CLOB AS LOCATOR",
 T_JSON_AS_LOCATOR : "JSON AS LOCATOR",
 T_XML_AS_LOCATOR : "XML AS LOCATOR"
}

def _getMs(m, num):
 ms = m.group(num)
Expand DownExpand Up@@ -134,6 +144,7 @@ def _convertInterval(dataType, value, regEx, *args):

def convertInterval(dataType, value):
 value = value.strip()
 dataType = re.sub (" ?\(([0-9, ]+)\)", "", dataType)
 if dataType == "INTERVAL YEAR":
 return _convertScalarInterval(dataType, value, "years")
 elif dataType == "INTERVAL YEAR TO MONTH":
Expand DownExpand Up@@ -172,9 +183,7 @@ def convertInterval(dataType, value):


def convertPeriod(dataType, value):
 m = periodRegEx1.match(value)
 if not m:
 m = periodRegEx2.match(value)
 m = periodRegEx.match(value)
 if m:
 if "TIMESTAMP" in dataType:
 start = convertTimestamp(m.group(1))
Expand All@@ -187,13 +196,38 @@ def convertPeriod(dataType, value):
 end = convertDate(m.group(2))
 else:
 raise InterfaceError("INVALID_PERIOD",
 "Unknown PERIOD data type: {}".format(
 "Unknown PERIOD data type: {} {}".format(
 dataType, value))
 else:
 raise InterfaceError(
 "INVALID_PERIOD", "{} format invalid: {}".format(dataType, value))
 return Period(start, end)
 #end convertPeriod

def removeTrailingZerosFromPeriod (value):
 if value is None:
 return value
 m = re.compile("\('(.*)',\s*'(.*)'\)").match(str(value))
 if m is not None and len (m.groups()) == 2:
 value = "{},{}".format (removeTrailingZeros (m.group (1)), removeTrailingZeros (m.group (2)))
 return value
 #end convertInParamPeriod

def removeTrailingZerosFromTimeAndTimestamp (value):
 if value is None:
 return value
 return removeTrailingZeros (str(value))

def removeTrailingZeros (value):
 seconds = re.compile(".*(\.[0-9]*).*").match (str(value))

 if seconds is not None:
 sSecond = seconds.group (1).rstrip ('0')
 sSecond = "" if len (sSecond) == 1 else sSecond
 value = re.sub ('\.[0-9]*', sSecond, str(value))

 return value
 #end removeTrailingZeros

def zeroIfNone(value):
 if value is None:
Expand All@@ -205,13 +239,13 @@ class DataTypeConverter:

 """Handles conversion of result set data types into python objects."""

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 raise NotImplementedError(
 "convertValue must be implemented by sub-class")

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 raise NotImplementedError(
 "convertType must be implemented by sub-class")
Expand All@@ -224,62 +258,59 @@ class DefaultDataTypeConverter (DataTypeConverter):
 def __init__(self, useFloat=False):
 self.useFloat = useFloat

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 logger.trace(
 "Converting \"%s\" to (%s, %s).", value, dataType, typeCode)
 if value is not None:
 if typeCode == NUMBER:
 try:
 return NUMBER(value)
 except:
 # Handle infinity and NaN for older ODBC drivers.
 if value == "1.#INF":
 return NUMBER('Infinity')
 elif value == "-1.#INF":
 return NUMBER('-Infinity')
 else:
 return NUMBER('NaN')
 return NUMBER(value)
 elif typeCode == float:
 return value if not util.isString else float(value)
 return value if not isinstance(value, str) else float(value)
 elif typeCode == Timestamp:
 if util.isString(value):
 if isinstance(value, str):
 return convertTimestamp(value)
 elif isinstance (value, datetime.date):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS)
 elif typeCode == Time:
 if util.isString(value):
 if isinstance(value, str):
 return convertTime(value)
 elif isinstance (value, datetime.time):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).time()
 elif typeCode == Date:
 if util.isString(value):
 if isinstance(value, str):
 return convertDate(value)
 else:
 elif isinstance (value, datetime.date):
 return (value)
 elif type (value) is int:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).date()
 elif typeCode == BINARY:
 if util.isString(value):
 if isinstance(value, str):
 return bytearray.fromhex(value)
 elif dataType.startswith("INTERVAL"):
 return convertInterval(dataType, value)
 elif dataType.startswith("JSON") and util.isString(value):
 elif dataType.startswith("JSON") and isinstance(value, str):
 return json.loads(value, parse_int=decimal.Decimal,
 parse_float=decimal.Decimal)
 elif dataType.startswith("PERIOD"):
 return convertPeriod(dataType, value)
 return value

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 typeCode = STRING
 if dataType in NUMBER_TYPES:
Expand DownExpand Up@@ -414,6 +445,8 @@ def __str__(self):
 _appendInterval(s, self.seconds, separator=":")
 if self.negative:
 s.insert(0, "-")
 else:
 s.insert(0, " ")
 return "".join(s)

 def __repr__(self):
Expand All@@ -436,6 +469,7 @@ class Period:
 def __init__(self, start, end):
 self.start = start
 self.end = end
 s = "('" + str(start) + "', '" + str(end) + "')"

 def __str__(self):
 return "('" + str(self.start) + "', '" + str(self.end) + "')"
Expand Down

4 changes: 0 additions & 4 deletions
teradata/pulljson.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
import json
import logging
from . import util # @UnusedImport # noqa
if sys.version_info[0] == 2:
 from StringIO import StringIO # @UnresolvedImport #@UnusedImport
else:
 from io import StringIO # @UnresolvedImport @UnusedImport @Reimport # noqa

logger = logging.getLogger(__name__)

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Hd121024 pydbapi 81 py td by htackett · Pull Request #126 · Teradata/PyTd · GitHub
Skip to content
Hd121024 pydbapi 81 py td#126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

htackett
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Hd121024 pydbapi 81 py td
#126
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1a2d917

pydbapi-81


htackett Dec 4, 2020
2362e8b

pydbapi-81


htackett Dec 11, 2020
4319edb

hd121024_pydbapi-81-PyTd


htackett Dec 11, 2020
930e9a1

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020
b6a2719

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1,118 changes: 1,103 additions & 15 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


20 changes: 11 additions & 9 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,17 @@
# The MIT License (MIT)
#
# Copyright (c) 2015 by Teradata
#
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All@@ -24,19 +24,21 @@
from setuptools import setup

# Make sure correct version of python is being used.
if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 7):
 print("The teradata module does not support this version of Python, the version must be 2.7 or later.")
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 4):
 print("The teradata module does not support this version of Python, the version must be 3.4 or later.")
 sys.exit(1)
with open('teradata/version.py') as f:

with open('teradata/version.py') as f:
 exec(f.read())

setup(name='teradata',
 version=__version__, # @UndefinedVariable
 author = 'Teradata Corporation',
 description='The Teradata python module for DevOps enabled SQL scripting for Teradata UDA.',
 url='http://github.com/teradata/PyTd',
 author='Teradata Corporation',
 author_email='eric.scheie@teradata.com',
 license='MIT',
 packages=['teradata'],
 install_requires=['teradatasql'],
 platforms = ['Windows', 'MacOS X', 'Linux'],
 python_requires = '>=3.4',
 zip_safe=True)

52 changes: 51 additions & 1 deletion
teradata/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,24 @@ def emit(self, record):

logging.getLogger("teradata").addHandler(NullHandler())

class InParam ():

 """Represents an input parameter from a Stored Procedure"""

 def __init__(self, value, dataType=None, size=None):
 self.inValue = value
 self.dataType = dataType
 self.size = size
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def setValueFunc(self, valueFunc):
 self.valueFunc = valueFunc

 def value(self):
 return None if self.valueFunc is None else self.valueFunc()

 def __repr__(self):
 return "InParam(value={}, dataType={})".format(self.inValue, self.dataType)

class OutParam ():

Expand DownExpand Up@@ -70,14 +88,44 @@ class InOutParam (OutParam):
 def __init__(self, value, name=None, dataType=None, size=None):
 OutParam.__init__(self, name, dataType, size)
 self.inValue = value
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def __repr__(self):
 return "InOutParam(value={}, name={}, dataType={}, size={})".format(
 self.inValue, self.name, self.dataType, self.size)

# Define exceptions
def determineEscapeParamType (datatype, value):
 from .datatypes import Interval, Period

 if datatype is None or value is None:
 return datatype

 if datatype.endswith ("AS LOCATOR") and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype.startswith (("BYTE", "VARBYTE", "LONG VARBYTE")) and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype in {"BYTEINT", "BIGINT", "INTEGER", "SMALLINT", "INT"} and isinstance (value, int):
 return datatype

 if datatype.startswith(("INTERVAL", "PERIOD", "DATE", "VARCHAR", "CHAR", "FLOAT", "NUMBER", "DECIMAL", "XML", "LONG VARCHAR")) and isinstance (value, str):
 return datatype

 if datatype.startswith ("INTERVAL") and isinstance (value, Interval):
 return datatype

 if datatype.startswith ("PERIOD") and isinstance (value, Period):
 return datatype

 if datatype.startswith ("TIME"):
 return datatype

 return None
 #end determineEscapeParamType


# Define exceptions
class Warning(Exception): # @ReservedAssignment

 def __init__(self, msg):
Expand DownExpand Up@@ -124,6 +172,7 @@ def __init__(self, code, msg):
class ProgrammingError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand DownExpand Up@@ -152,6 +201,7 @@ def __init__(self, code, msg):
class OperationalError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand Down

90 changes: 62 additions & 28 deletions
teradata/datatypes.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,12 @@
hourToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+):(\d+\.?\d*)$")
minuteToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+\.?\d*)$")
secondIntervalRegEx = re.compile("^(-?)(\d+\.?\d*)$")
periodRegEx1 = re.compile("\('(.*)',\s*'(.*)'\)")
periodRegEx2 = re.compile("ResultStruct:PERIOD\(.*\)\[(.*),\s*(.*)\]")
periodRegEx = re.compile("(.*),\s*(.*)")

T_BLOB_AS_LOCATOR = 408
T_CLOB_AS_LOCATOR = 424
T_JSON_AS_LOCATOR = 884
T_XML_AS_LOCATOR = 860

NUMBER_TYPES = {"BYTEINT", "BIGINT", "DECIMAL", "DOUBLE", "DOUBLE PRECISION",
 "INTEGER", "NUMBER", "SMALLINT", "FLOAT", "INT", "NUMERIC",
Expand All@@ -55,8 +59,14 @@

FLOAT_TYPES = {"FLOAT", "DOUBLE", "DOUBLE PRECISION", "REAL"}

BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE"}
BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE", "LONG VARBYTE"}

LOB_LOCATOR_TYPES = {
 T_BLOB_AS_LOCATOR : "BLOB AS LOCATOR",
 T_CLOB_AS_LOCATOR : "CLOB AS LOCATOR",
 T_JSON_AS_LOCATOR : "JSON AS LOCATOR",
 T_XML_AS_LOCATOR : "XML AS LOCATOR"
}

def _getMs(m, num):
 ms = m.group(num)
Expand DownExpand Up@@ -134,6 +144,7 @@ def _convertInterval(dataType, value, regEx, *args):

def convertInterval(dataType, value):
 value = value.strip()
 dataType = re.sub (" ?\(([0-9, ]+)\)", "", dataType)
 if dataType == "INTERVAL YEAR":
 return _convertScalarInterval(dataType, value, "years")
 elif dataType == "INTERVAL YEAR TO MONTH":
Expand DownExpand Up@@ -172,9 +183,7 @@ def convertInterval(dataType, value):


def convertPeriod(dataType, value):
 m = periodRegEx1.match(value)
 if not m:
 m = periodRegEx2.match(value)
 m = periodRegEx.match(value)
 if m:
 if "TIMESTAMP" in dataType:
 start = convertTimestamp(m.group(1))
Expand All@@ -187,13 +196,38 @@ def convertPeriod(dataType, value):
 end = convertDate(m.group(2))
 else:
 raise InterfaceError("INVALID_PERIOD",
 "Unknown PERIOD data type: {}".format(
 "Unknown PERIOD data type: {} {}".format(
 dataType, value))
 else:
 raise InterfaceError(
 "INVALID_PERIOD", "{} format invalid: {}".format(dataType, value))
 return Period(start, end)
 #end convertPeriod

def removeTrailingZerosFromPeriod (value):
 if value is None:
 return value
 m = re.compile("\('(.*)',\s*'(.*)'\)").match(str(value))
 if m is not None and len (m.groups()) == 2:
 value = "{},{}".format (removeTrailingZeros (m.group (1)), removeTrailingZeros (m.group (2)))
 return value
 #end convertInParamPeriod

def removeTrailingZerosFromTimeAndTimestamp (value):
 if value is None:
 return value
 return removeTrailingZeros (str(value))

def removeTrailingZeros (value):
 seconds = re.compile(".*(\.[0-9]*).*").match (str(value))

 if seconds is not None:
 sSecond = seconds.group (1).rstrip ('0')
 sSecond = "" if len (sSecond) == 1 else sSecond
 value = re.sub ('\.[0-9]*', sSecond, str(value))

 return value
 #end removeTrailingZeros

def zeroIfNone(value):
 if value is None:
Expand All@@ -205,13 +239,13 @@ class DataTypeConverter:

 """Handles conversion of result set data types into python objects."""

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 raise NotImplementedError(
 "convertValue must be implemented by sub-class")

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 raise NotImplementedError(
 "convertType must be implemented by sub-class")
Expand All@@ -224,62 +258,59 @@ class DefaultDataTypeConverter (DataTypeConverter):
 def __init__(self, useFloat=False):
 self.useFloat = useFloat

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 logger.trace(
 "Converting \"%s\" to (%s, %s).", value, dataType, typeCode)
 if value is not None:
 if typeCode == NUMBER:
 try:
 return NUMBER(value)
 except:
 # Handle infinity and NaN for older ODBC drivers.
 if value == "1.#INF":
 return NUMBER('Infinity')
 elif value == "-1.#INF":
 return NUMBER('-Infinity')
 else:
 return NUMBER('NaN')
 return NUMBER(value)
 elif typeCode == float:
 return value if not util.isString else float(value)
 return value if not isinstance(value, str) else float(value)
 elif typeCode == Timestamp:
 if util.isString(value):
 if isinstance(value, str):
 return convertTimestamp(value)
 elif isinstance (value, datetime.date):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS)
 elif typeCode == Time:
 if util.isString(value):
 if isinstance(value, str):
 return convertTime(value)
 elif isinstance (value, datetime.time):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).time()
 elif typeCode == Date:
 if util.isString(value):
 if isinstance(value, str):
 return convertDate(value)
 else:
 elif isinstance (value, datetime.date):
 return (value)
 elif type (value) is int:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).date()
 elif typeCode == BINARY:
 if util.isString(value):
 if isinstance(value, str):
 return bytearray.fromhex(value)
 elif dataType.startswith("INTERVAL"):
 return convertInterval(dataType, value)
 elif dataType.startswith("JSON") and util.isString(value):
 elif dataType.startswith("JSON") and isinstance(value, str):
 return json.loads(value, parse_int=decimal.Decimal,
 parse_float=decimal.Decimal)
 elif dataType.startswith("PERIOD"):
 return convertPeriod(dataType, value)
 return value

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 typeCode = STRING
 if dataType in NUMBER_TYPES:
Expand DownExpand Up@@ -414,6 +445,8 @@ def __str__(self):
 _appendInterval(s, self.seconds, separator=":")
 if self.negative:
 s.insert(0, "-")
 else:
 s.insert(0, " ")
 return "".join(s)

 def __repr__(self):
Expand All@@ -436,6 +469,7 @@ class Period:
 def __init__(self, start, end):
 self.start = start
 self.end = end
 s = "('" + str(start) + "', '" + str(end) + "')"

 def __str__(self):
 return "('" + str(self.start) + "', '" + str(self.end) + "')"
Expand Down

4 changes: 0 additions & 4 deletions
teradata/pulljson.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
import json
import logging
from . import util # @UnusedImport # noqa
if sys.version_info[0] == 2:
 from StringIO import StringIO # @UnresolvedImport #@UnusedImport
else:
 from io import StringIO # @UnresolvedImport @UnusedImport @Reimport # noqa

logger = logging.getLogger(__name__)

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Hd121024 pydbapi 81 py td by htackett · Pull Request #126 · Teradata/PyTd · GitHub
Skip to content
Hd121024 pydbapi 81 py td#126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

htackett
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Hd121024 pydbapi 81 py td
#126
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1a2d917

pydbapi-81


htackett Dec 4, 2020
2362e8b

pydbapi-81


htackett Dec 11, 2020
4319edb

hd121024_pydbapi-81-PyTd


htackett Dec 11, 2020
930e9a1

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020
b6a2719

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1,118 changes: 1,103 additions & 15 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


20 changes: 11 additions & 9 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,17 @@
# The MIT License (MIT)
#
# Copyright (c) 2015 by Teradata
#
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All@@ -24,19 +24,21 @@
from setuptools import setup

# Make sure correct version of python is being used.
if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 7):
 print("The teradata module does not support this version of Python, the version must be 2.7 or later.")
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 4):
 print("The teradata module does not support this version of Python, the version must be 3.4 or later.")
 sys.exit(1)
with open('teradata/version.py') as f:

with open('teradata/version.py') as f:
 exec(f.read())

setup(name='teradata',
 version=__version__, # @UndefinedVariable
 author = 'Teradata Corporation',
 description='The Teradata python module for DevOps enabled SQL scripting for Teradata UDA.',
 url='http://github.com/teradata/PyTd',
 author='Teradata Corporation',
 author_email='eric.scheie@teradata.com',
 license='MIT',
 packages=['teradata'],
 install_requires=['teradatasql'],
 platforms = ['Windows', 'MacOS X', 'Linux'],
 python_requires = '>=3.4',
 zip_safe=True)

52 changes: 51 additions & 1 deletion
teradata/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,24 @@ def emit(self, record):

logging.getLogger("teradata").addHandler(NullHandler())

class InParam ():

 """Represents an input parameter from a Stored Procedure"""

 def __init__(self, value, dataType=None, size=None):
 self.inValue = value
 self.dataType = dataType
 self.size = size
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def setValueFunc(self, valueFunc):
 self.valueFunc = valueFunc

 def value(self):
 return None if self.valueFunc is None else self.valueFunc()

 def __repr__(self):
 return "InParam(value={}, dataType={})".format(self.inValue, self.dataType)

class OutParam ():

Expand DownExpand Up@@ -70,14 +88,44 @@ class InOutParam (OutParam):
 def __init__(self, value, name=None, dataType=None, size=None):
 OutParam.__init__(self, name, dataType, size)
 self.inValue = value
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def __repr__(self):
 return "InOutParam(value={}, name={}, dataType={}, size={})".format(
 self.inValue, self.name, self.dataType, self.size)

# Define exceptions
def determineEscapeParamType (datatype, value):
 from .datatypes import Interval, Period

 if datatype is None or value is None:
 return datatype

 if datatype.endswith ("AS LOCATOR") and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype.startswith (("BYTE", "VARBYTE", "LONG VARBYTE")) and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype in {"BYTEINT", "BIGINT", "INTEGER", "SMALLINT", "INT"} and isinstance (value, int):
 return datatype

 if datatype.startswith(("INTERVAL", "PERIOD", "DATE", "VARCHAR", "CHAR", "FLOAT", "NUMBER", "DECIMAL", "XML", "LONG VARCHAR")) and isinstance (value, str):
 return datatype

 if datatype.startswith ("INTERVAL") and isinstance (value, Interval):
 return datatype

 if datatype.startswith ("PERIOD") and isinstance (value, Period):
 return datatype

 if datatype.startswith ("TIME"):
 return datatype

 return None
 #end determineEscapeParamType


# Define exceptions
class Warning(Exception): # @ReservedAssignment

 def __init__(self, msg):
Expand DownExpand Up@@ -124,6 +172,7 @@ def __init__(self, code, msg):
class ProgrammingError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand DownExpand Up@@ -152,6 +201,7 @@ def __init__(self, code, msg):
class OperationalError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand Down

90 changes: 62 additions & 28 deletions
teradata/datatypes.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,12 @@
hourToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+):(\d+\.?\d*)$")
minuteToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+\.?\d*)$")
secondIntervalRegEx = re.compile("^(-?)(\d+\.?\d*)$")
periodRegEx1 = re.compile("\('(.*)',\s*'(.*)'\)")
periodRegEx2 = re.compile("ResultStruct:PERIOD\(.*\)\[(.*),\s*(.*)\]")
periodRegEx = re.compile("(.*),\s*(.*)")

T_BLOB_AS_LOCATOR = 408
T_CLOB_AS_LOCATOR = 424
T_JSON_AS_LOCATOR = 884
T_XML_AS_LOCATOR = 860

NUMBER_TYPES = {"BYTEINT", "BIGINT", "DECIMAL", "DOUBLE", "DOUBLE PRECISION",
 "INTEGER", "NUMBER", "SMALLINT", "FLOAT", "INT", "NUMERIC",
Expand All@@ -55,8 +59,14 @@

FLOAT_TYPES = {"FLOAT", "DOUBLE", "DOUBLE PRECISION", "REAL"}

BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE"}
BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE", "LONG VARBYTE"}

LOB_LOCATOR_TYPES = {
 T_BLOB_AS_LOCATOR : "BLOB AS LOCATOR",
 T_CLOB_AS_LOCATOR : "CLOB AS LOCATOR",
 T_JSON_AS_LOCATOR : "JSON AS LOCATOR",
 T_XML_AS_LOCATOR : "XML AS LOCATOR"
}

def _getMs(m, num):
 ms = m.group(num)
Expand DownExpand Up@@ -134,6 +144,7 @@ def _convertInterval(dataType, value, regEx, *args):

def convertInterval(dataType, value):
 value = value.strip()
 dataType = re.sub (" ?\(([0-9, ]+)\)", "", dataType)
 if dataType == "INTERVAL YEAR":
 return _convertScalarInterval(dataType, value, "years")
 elif dataType == "INTERVAL YEAR TO MONTH":
Expand DownExpand Up@@ -172,9 +183,7 @@ def convertInterval(dataType, value):


def convertPeriod(dataType, value):
 m = periodRegEx1.match(value)
 if not m:
 m = periodRegEx2.match(value)
 m = periodRegEx.match(value)
 if m:
 if "TIMESTAMP" in dataType:
 start = convertTimestamp(m.group(1))
Expand All@@ -187,13 +196,38 @@ def convertPeriod(dataType, value):
 end = convertDate(m.group(2))
 else:
 raise InterfaceError("INVALID_PERIOD",
 "Unknown PERIOD data type: {}".format(
 "Unknown PERIOD data type: {} {}".format(
 dataType, value))
 else:
 raise InterfaceError(
 "INVALID_PERIOD", "{} format invalid: {}".format(dataType, value))
 return Period(start, end)
 #end convertPeriod

def removeTrailingZerosFromPeriod (value):
 if value is None:
 return value
 m = re.compile("\('(.*)',\s*'(.*)'\)").match(str(value))
 if m is not None and len (m.groups()) == 2:
 value = "{},{}".format (removeTrailingZeros (m.group (1)), removeTrailingZeros (m.group (2)))
 return value
 #end convertInParamPeriod

def removeTrailingZerosFromTimeAndTimestamp (value):
 if value is None:
 return value
 return removeTrailingZeros (str(value))

def removeTrailingZeros (value):
 seconds = re.compile(".*(\.[0-9]*).*").match (str(value))

 if seconds is not None:
 sSecond = seconds.group (1).rstrip ('0')
 sSecond = "" if len (sSecond) == 1 else sSecond
 value = re.sub ('\.[0-9]*', sSecond, str(value))

 return value
 #end removeTrailingZeros

def zeroIfNone(value):
 if value is None:
Expand All@@ -205,13 +239,13 @@ class DataTypeConverter:

 """Handles conversion of result set data types into python objects."""

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 raise NotImplementedError(
 "convertValue must be implemented by sub-class")

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 raise NotImplementedError(
 "convertType must be implemented by sub-class")
Expand All@@ -224,62 +258,59 @@ class DefaultDataTypeConverter (DataTypeConverter):
 def __init__(self, useFloat=False):
 self.useFloat = useFloat

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 logger.trace(
 "Converting \"%s\" to (%s, %s).", value, dataType, typeCode)
 if value is not None:
 if typeCode == NUMBER:
 try:
 return NUMBER(value)
 except:
 # Handle infinity and NaN for older ODBC drivers.
 if value == "1.#INF":
 return NUMBER('Infinity')
 elif value == "-1.#INF":
 return NUMBER('-Infinity')
 else:
 return NUMBER('NaN')
 return NUMBER(value)
 elif typeCode == float:
 return value if not util.isString else float(value)
 return value if not isinstance(value, str) else float(value)
 elif typeCode == Timestamp:
 if util.isString(value):
 if isinstance(value, str):
 return convertTimestamp(value)
 elif isinstance (value, datetime.date):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS)
 elif typeCode == Time:
 if util.isString(value):
 if isinstance(value, str):
 return convertTime(value)
 elif isinstance (value, datetime.time):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).time()
 elif typeCode == Date:
 if util.isString(value):
 if isinstance(value, str):
 return convertDate(value)
 else:
 elif isinstance (value, datetime.date):
 return (value)
 elif type (value) is int:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).date()
 elif typeCode == BINARY:
 if util.isString(value):
 if isinstance(value, str):
 return bytearray.fromhex(value)
 elif dataType.startswith("INTERVAL"):
 return convertInterval(dataType, value)
 elif dataType.startswith("JSON") and util.isString(value):
 elif dataType.startswith("JSON") and isinstance(value, str):
 return json.loads(value, parse_int=decimal.Decimal,
 parse_float=decimal.Decimal)
 elif dataType.startswith("PERIOD"):
 return convertPeriod(dataType, value)
 return value

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 typeCode = STRING
 if dataType in NUMBER_TYPES:
Expand DownExpand Up@@ -414,6 +445,8 @@ def __str__(self):
 _appendInterval(s, self.seconds, separator=":")
 if self.negative:
 s.insert(0, "-")
 else:
 s.insert(0, " ")
 return "".join(s)

 def __repr__(self):
Expand All@@ -436,6 +469,7 @@ class Period:
 def __init__(self, start, end):
 self.start = start
 self.end = end
 s = "('" + str(start) + "', '" + str(end) + "')"

 def __str__(self):
 return "('" + str(self.start) + "', '" + str(self.end) + "')"
Expand Down

4 changes: 0 additions & 4 deletions
teradata/pulljson.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
import json
import logging
from . import util # @UnusedImport # noqa
if sys.version_info[0] == 2:
 from StringIO import StringIO # @UnresolvedImport #@UnusedImport
else:
 from io import StringIO # @UnresolvedImport @UnusedImport @Reimport # noqa

logger = logging.getLogger(__name__)

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Hd121024 pydbapi 81 py td by htackett · Pull Request #126 · Teradata/PyTd · GitHub
Skip to content
Hd121024 pydbapi 81 py td#126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

htackett
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Hd121024 pydbapi 81 py td
#126
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1a2d917

pydbapi-81


htackett Dec 4, 2020
2362e8b

pydbapi-81


htackett Dec 11, 2020
4319edb

hd121024_pydbapi-81-PyTd


htackett Dec 11, 2020
930e9a1

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020
b6a2719

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1,118 changes: 1,103 additions & 15 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


20 changes: 11 additions & 9 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,17 @@
# The MIT License (MIT)
#
# Copyright (c) 2015 by Teradata
#
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All@@ -24,19 +24,21 @@
from setuptools import setup

# Make sure correct version of python is being used.
if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 7):
 print("The teradata module does not support this version of Python, the version must be 2.7 or later.")
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 4):
 print("The teradata module does not support this version of Python, the version must be 3.4 or later.")
 sys.exit(1)
with open('teradata/version.py') as f:

with open('teradata/version.py') as f:
 exec(f.read())

setup(name='teradata',
 version=__version__, # @UndefinedVariable
 author = 'Teradata Corporation',
 description='The Teradata python module for DevOps enabled SQL scripting for Teradata UDA.',
 url='http://github.com/teradata/PyTd',
 author='Teradata Corporation',
 author_email='eric.scheie@teradata.com',
 license='MIT',
 packages=['teradata'],
 install_requires=['teradatasql'],
 platforms = ['Windows', 'MacOS X', 'Linux'],
 python_requires = '>=3.4',
 zip_safe=True)

52 changes: 51 additions & 1 deletion
teradata/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,24 @@ def emit(self, record):

logging.getLogger("teradata").addHandler(NullHandler())

class InParam ():

 """Represents an input parameter from a Stored Procedure"""

 def __init__(self, value, dataType=None, size=None):
 self.inValue = value
 self.dataType = dataType
 self.size = size
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def setValueFunc(self, valueFunc):
 self.valueFunc = valueFunc

 def value(self):
 return None if self.valueFunc is None else self.valueFunc()

 def __repr__(self):
 return "InParam(value={}, dataType={})".format(self.inValue, self.dataType)

class OutParam ():

Expand DownExpand Up@@ -70,14 +88,44 @@ class InOutParam (OutParam):
 def __init__(self, value, name=None, dataType=None, size=None):
 OutParam.__init__(self, name, dataType, size)
 self.inValue = value
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def __repr__(self):
 return "InOutParam(value={}, name={}, dataType={}, size={})".format(
 self.inValue, self.name, self.dataType, self.size)

# Define exceptions
def determineEscapeParamType (datatype, value):
 from .datatypes import Interval, Period

 if datatype is None or value is None:
 return datatype

 if datatype.endswith ("AS LOCATOR") and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype.startswith (("BYTE", "VARBYTE", "LONG VARBYTE")) and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype in {"BYTEINT", "BIGINT", "INTEGER", "SMALLINT", "INT"} and isinstance (value, int):
 return datatype

 if datatype.startswith(("INTERVAL", "PERIOD", "DATE", "VARCHAR", "CHAR", "FLOAT", "NUMBER", "DECIMAL", "XML", "LONG VARCHAR")) and isinstance (value, str):
 return datatype

 if datatype.startswith ("INTERVAL") and isinstance (value, Interval):
 return datatype

 if datatype.startswith ("PERIOD") and isinstance (value, Period):
 return datatype

 if datatype.startswith ("TIME"):
 return datatype

 return None
 #end determineEscapeParamType


# Define exceptions
class Warning(Exception): # @ReservedAssignment

 def __init__(self, msg):
Expand DownExpand Up@@ -124,6 +172,7 @@ def __init__(self, code, msg):
class ProgrammingError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand DownExpand Up@@ -152,6 +201,7 @@ def __init__(self, code, msg):
class OperationalError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand Down

90 changes: 62 additions & 28 deletions
teradata/datatypes.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,12 @@
hourToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+):(\d+\.?\d*)$")
minuteToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+\.?\d*)$")
secondIntervalRegEx = re.compile("^(-?)(\d+\.?\d*)$")
periodRegEx1 = re.compile("\('(.*)',\s*'(.*)'\)")
periodRegEx2 = re.compile("ResultStruct:PERIOD\(.*\)\[(.*),\s*(.*)\]")
periodRegEx = re.compile("(.*),\s*(.*)")

T_BLOB_AS_LOCATOR = 408
T_CLOB_AS_LOCATOR = 424
T_JSON_AS_LOCATOR = 884
T_XML_AS_LOCATOR = 860

NUMBER_TYPES = {"BYTEINT", "BIGINT", "DECIMAL", "DOUBLE", "DOUBLE PRECISION",
 "INTEGER", "NUMBER", "SMALLINT", "FLOAT", "INT", "NUMERIC",
Expand All@@ -55,8 +59,14 @@

FLOAT_TYPES = {"FLOAT", "DOUBLE", "DOUBLE PRECISION", "REAL"}

BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE"}
BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE", "LONG VARBYTE"}

LOB_LOCATOR_TYPES = {
 T_BLOB_AS_LOCATOR : "BLOB AS LOCATOR",
 T_CLOB_AS_LOCATOR : "CLOB AS LOCATOR",
 T_JSON_AS_LOCATOR : "JSON AS LOCATOR",
 T_XML_AS_LOCATOR : "XML AS LOCATOR"
}

def _getMs(m, num):
 ms = m.group(num)
Expand DownExpand Up@@ -134,6 +144,7 @@ def _convertInterval(dataType, value, regEx, *args):

def convertInterval(dataType, value):
 value = value.strip()
 dataType = re.sub (" ?\(([0-9, ]+)\)", "", dataType)
 if dataType == "INTERVAL YEAR":
 return _convertScalarInterval(dataType, value, "years")
 elif dataType == "INTERVAL YEAR TO MONTH":
Expand DownExpand Up@@ -172,9 +183,7 @@ def convertInterval(dataType, value):


def convertPeriod(dataType, value):
 m = periodRegEx1.match(value)
 if not m:
 m = periodRegEx2.match(value)
 m = periodRegEx.match(value)
 if m:
 if "TIMESTAMP" in dataType:
 start = convertTimestamp(m.group(1))
Expand All@@ -187,13 +196,38 @@ def convertPeriod(dataType, value):
 end = convertDate(m.group(2))
 else:
 raise InterfaceError("INVALID_PERIOD",
 "Unknown PERIOD data type: {}".format(
 "Unknown PERIOD data type: {} {}".format(
 dataType, value))
 else:
 raise InterfaceError(
 "INVALID_PERIOD", "{} format invalid: {}".format(dataType, value))
 return Period(start, end)
 #end convertPeriod

def removeTrailingZerosFromPeriod (value):
 if value is None:
 return value
 m = re.compile("\('(.*)',\s*'(.*)'\)").match(str(value))
 if m is not None and len (m.groups()) == 2:
 value = "{},{}".format (removeTrailingZeros (m.group (1)), removeTrailingZeros (m.group (2)))
 return value
 #end convertInParamPeriod

def removeTrailingZerosFromTimeAndTimestamp (value):
 if value is None:
 return value
 return removeTrailingZeros (str(value))

def removeTrailingZeros (value):
 seconds = re.compile(".*(\.[0-9]*).*").match (str(value))

 if seconds is not None:
 sSecond = seconds.group (1).rstrip ('0')
 sSecond = "" if len (sSecond) == 1 else sSecond
 value = re.sub ('\.[0-9]*', sSecond, str(value))

 return value
 #end removeTrailingZeros

def zeroIfNone(value):
 if value is None:
Expand All@@ -205,13 +239,13 @@ class DataTypeConverter:

 """Handles conversion of result set data types into python objects."""

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 raise NotImplementedError(
 "convertValue must be implemented by sub-class")

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 raise NotImplementedError(
 "convertType must be implemented by sub-class")
Expand All@@ -224,62 +258,59 @@ class DefaultDataTypeConverter (DataTypeConverter):
 def __init__(self, useFloat=False):
 self.useFloat = useFloat

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 logger.trace(
 "Converting \"%s\" to (%s, %s).", value, dataType, typeCode)
 if value is not None:
 if typeCode == NUMBER:
 try:
 return NUMBER(value)
 except:
 # Handle infinity and NaN for older ODBC drivers.
 if value == "1.#INF":
 return NUMBER('Infinity')
 elif value == "-1.#INF":
 return NUMBER('-Infinity')
 else:
 return NUMBER('NaN')
 return NUMBER(value)
 elif typeCode == float:
 return value if not util.isString else float(value)
 return value if not isinstance(value, str) else float(value)
 elif typeCode == Timestamp:
 if util.isString(value):
 if isinstance(value, str):
 return convertTimestamp(value)
 elif isinstance (value, datetime.date):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS)
 elif typeCode == Time:
 if util.isString(value):
 if isinstance(value, str):
 return convertTime(value)
 elif isinstance (value, datetime.time):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).time()
 elif typeCode == Date:
 if util.isString(value):
 if isinstance(value, str):
 return convertDate(value)
 else:
 elif isinstance (value, datetime.date):
 return (value)
 elif type (value) is int:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).date()
 elif typeCode == BINARY:
 if util.isString(value):
 if isinstance(value, str):
 return bytearray.fromhex(value)
 elif dataType.startswith("INTERVAL"):
 return convertInterval(dataType, value)
 elif dataType.startswith("JSON") and util.isString(value):
 elif dataType.startswith("JSON") and isinstance(value, str):
 return json.loads(value, parse_int=decimal.Decimal,
 parse_float=decimal.Decimal)
 elif dataType.startswith("PERIOD"):
 return convertPeriod(dataType, value)
 return value

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 typeCode = STRING
 if dataType in NUMBER_TYPES:
Expand DownExpand Up@@ -414,6 +445,8 @@ def __str__(self):
 _appendInterval(s, self.seconds, separator=":")
 if self.negative:
 s.insert(0, "-")
 else:
 s.insert(0, " ")
 return "".join(s)

 def __repr__(self):
Expand All@@ -436,6 +469,7 @@ class Period:
 def __init__(self, start, end):
 self.start = start
 self.end = end
 s = "('" + str(start) + "', '" + str(end) + "')"

 def __str__(self):
 return "('" + str(self.start) + "', '" + str(self.end) + "')"
Expand Down

4 changes: 0 additions & 4 deletions
teradata/pulljson.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
import json
import logging
from . import util # @UnusedImport # noqa
if sys.version_info[0] == 2:
 from StringIO import StringIO # @UnresolvedImport #@UnusedImport
else:
 from io import StringIO # @UnresolvedImport @UnusedImport @Reimport # noqa

logger = logging.getLogger(__name__)

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Hd121024 pydbapi 81 py td by htackett · Pull Request #126 · Teradata/PyTd · GitHub
Skip to content
Hd121024 pydbapi 81 py td#126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

htackett
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Hd121024 pydbapi 81 py td
#126
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1a2d917

pydbapi-81


htackett Dec 4, 2020
2362e8b

pydbapi-81


htackett Dec 11, 2020
4319edb

hd121024_pydbapi-81-PyTd


htackett Dec 11, 2020
930e9a1

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020
b6a2719

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1,118 changes: 1,103 additions & 15 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


20 changes: 11 additions & 9 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,17 @@
# The MIT License (MIT)
#
# Copyright (c) 2015 by Teradata
#
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All@@ -24,19 +24,21 @@
from setuptools import setup

# Make sure correct version of python is being used.
if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 7):
 print("The teradata module does not support this version of Python, the version must be 2.7 or later.")
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 4):
 print("The teradata module does not support this version of Python, the version must be 3.4 or later.")
 sys.exit(1)
with open('teradata/version.py') as f:

with open('teradata/version.py') as f:
 exec(f.read())

setup(name='teradata',
 version=__version__, # @UndefinedVariable
 author = 'Teradata Corporation',
 description='The Teradata python module for DevOps enabled SQL scripting for Teradata UDA.',
 url='http://github.com/teradata/PyTd',
 author='Teradata Corporation',
 author_email='eric.scheie@teradata.com',
 license='MIT',
 packages=['teradata'],
 install_requires=['teradatasql'],
 platforms = ['Windows', 'MacOS X', 'Linux'],
 python_requires = '>=3.4',
 zip_safe=True)

52 changes: 51 additions & 1 deletion
teradata/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,24 @@ def emit(self, record):

logging.getLogger("teradata").addHandler(NullHandler())

class InParam ():

 """Represents an input parameter from a Stored Procedure"""

 def __init__(self, value, dataType=None, size=None):
 self.inValue = value
 self.dataType = dataType
 self.size = size
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def setValueFunc(self, valueFunc):
 self.valueFunc = valueFunc

 def value(self):
 return None if self.valueFunc is None else self.valueFunc()

 def __repr__(self):
 return "InParam(value={}, dataType={})".format(self.inValue, self.dataType)

class OutParam ():

Expand DownExpand Up@@ -70,14 +88,44 @@ class InOutParam (OutParam):
 def __init__(self, value, name=None, dataType=None, size=None):
 OutParam.__init__(self, name, dataType, size)
 self.inValue = value
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def __repr__(self):
 return "InOutParam(value={}, name={}, dataType={}, size={})".format(
 self.inValue, self.name, self.dataType, self.size)

# Define exceptions
def determineEscapeParamType (datatype, value):
 from .datatypes import Interval, Period

 if datatype is None or value is None:
 return datatype

 if datatype.endswith ("AS LOCATOR") and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype.startswith (("BYTE", "VARBYTE", "LONG VARBYTE")) and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype in {"BYTEINT", "BIGINT", "INTEGER", "SMALLINT", "INT"} and isinstance (value, int):
 return datatype

 if datatype.startswith(("INTERVAL", "PERIOD", "DATE", "VARCHAR", "CHAR", "FLOAT", "NUMBER", "DECIMAL", "XML", "LONG VARCHAR")) and isinstance (value, str):
 return datatype

 if datatype.startswith ("INTERVAL") and isinstance (value, Interval):
 return datatype

 if datatype.startswith ("PERIOD") and isinstance (value, Period):
 return datatype

 if datatype.startswith ("TIME"):
 return datatype

 return None
 #end determineEscapeParamType


# Define exceptions
class Warning(Exception): # @ReservedAssignment

 def __init__(self, msg):
Expand DownExpand Up@@ -124,6 +172,7 @@ def __init__(self, code, msg):
class ProgrammingError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand DownExpand Up@@ -152,6 +201,7 @@ def __init__(self, code, msg):
class OperationalError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand Down

90 changes: 62 additions & 28 deletions
teradata/datatypes.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,12 @@
hourToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+):(\d+\.?\d*)$")
minuteToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+\.?\d*)$")
secondIntervalRegEx = re.compile("^(-?)(\d+\.?\d*)$")
periodRegEx1 = re.compile("\('(.*)',\s*'(.*)'\)")
periodRegEx2 = re.compile("ResultStruct:PERIOD\(.*\)\[(.*),\s*(.*)\]")
periodRegEx = re.compile("(.*),\s*(.*)")

T_BLOB_AS_LOCATOR = 408
T_CLOB_AS_LOCATOR = 424
T_JSON_AS_LOCATOR = 884
T_XML_AS_LOCATOR = 860

NUMBER_TYPES = {"BYTEINT", "BIGINT", "DECIMAL", "DOUBLE", "DOUBLE PRECISION",
 "INTEGER", "NUMBER", "SMALLINT", "FLOAT", "INT", "NUMERIC",
Expand All@@ -55,8 +59,14 @@

FLOAT_TYPES = {"FLOAT", "DOUBLE", "DOUBLE PRECISION", "REAL"}

BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE"}
BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE", "LONG VARBYTE"}

LOB_LOCATOR_TYPES = {
 T_BLOB_AS_LOCATOR : "BLOB AS LOCATOR",
 T_CLOB_AS_LOCATOR : "CLOB AS LOCATOR",
 T_JSON_AS_LOCATOR : "JSON AS LOCATOR",
 T_XML_AS_LOCATOR : "XML AS LOCATOR"
}

def _getMs(m, num):
 ms = m.group(num)
Expand DownExpand Up@@ -134,6 +144,7 @@ def _convertInterval(dataType, value, regEx, *args):

def convertInterval(dataType, value):
 value = value.strip()
 dataType = re.sub (" ?\(([0-9, ]+)\)", "", dataType)
 if dataType == "INTERVAL YEAR":
 return _convertScalarInterval(dataType, value, "years")
 elif dataType == "INTERVAL YEAR TO MONTH":
Expand DownExpand Up@@ -172,9 +183,7 @@ def convertInterval(dataType, value):


def convertPeriod(dataType, value):
 m = periodRegEx1.match(value)
 if not m:
 m = periodRegEx2.match(value)
 m = periodRegEx.match(value)
 if m:
 if "TIMESTAMP" in dataType:
 start = convertTimestamp(m.group(1))
Expand All@@ -187,13 +196,38 @@ def convertPeriod(dataType, value):
 end = convertDate(m.group(2))
 else:
 raise InterfaceError("INVALID_PERIOD",
 "Unknown PERIOD data type: {}".format(
 "Unknown PERIOD data type: {} {}".format(
 dataType, value))
 else:
 raise InterfaceError(
 "INVALID_PERIOD", "{} format invalid: {}".format(dataType, value))
 return Period(start, end)
 #end convertPeriod

def removeTrailingZerosFromPeriod (value):
 if value is None:
 return value
 m = re.compile("\('(.*)',\s*'(.*)'\)").match(str(value))
 if m is not None and len (m.groups()) == 2:
 value = "{},{}".format (removeTrailingZeros (m.group (1)), removeTrailingZeros (m.group (2)))
 return value
 #end convertInParamPeriod

def removeTrailingZerosFromTimeAndTimestamp (value):
 if value is None:
 return value
 return removeTrailingZeros (str(value))

def removeTrailingZeros (value):
 seconds = re.compile(".*(\.[0-9]*).*").match (str(value))

 if seconds is not None:
 sSecond = seconds.group (1).rstrip ('0')
 sSecond = "" if len (sSecond) == 1 else sSecond
 value = re.sub ('\.[0-9]*', sSecond, str(value))

 return value
 #end removeTrailingZeros

def zeroIfNone(value):
 if value is None:
Expand All@@ -205,13 +239,13 @@ class DataTypeConverter:

 """Handles conversion of result set data types into python objects."""

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 raise NotImplementedError(
 "convertValue must be implemented by sub-class")

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 raise NotImplementedError(
 "convertType must be implemented by sub-class")
Expand All@@ -224,62 +258,59 @@ class DefaultDataTypeConverter (DataTypeConverter):
 def __init__(self, useFloat=False):
 self.useFloat = useFloat

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 logger.trace(
 "Converting \"%s\" to (%s, %s).", value, dataType, typeCode)
 if value is not None:
 if typeCode == NUMBER:
 try:
 return NUMBER(value)
 except:
 # Handle infinity and NaN for older ODBC drivers.
 if value == "1.#INF":
 return NUMBER('Infinity')
 elif value == "-1.#INF":
 return NUMBER('-Infinity')
 else:
 return NUMBER('NaN')
 return NUMBER(value)
 elif typeCode == float:
 return value if not util.isString else float(value)
 return value if not isinstance(value, str) else float(value)
 elif typeCode == Timestamp:
 if util.isString(value):
 if isinstance(value, str):
 return convertTimestamp(value)
 elif isinstance (value, datetime.date):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS)
 elif typeCode == Time:
 if util.isString(value):
 if isinstance(value, str):
 return convertTime(value)
 elif isinstance (value, datetime.time):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).time()
 elif typeCode == Date:
 if util.isString(value):
 if isinstance(value, str):
 return convertDate(value)
 else:
 elif isinstance (value, datetime.date):
 return (value)
 elif type (value) is int:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).date()
 elif typeCode == BINARY:
 if util.isString(value):
 if isinstance(value, str):
 return bytearray.fromhex(value)
 elif dataType.startswith("INTERVAL"):
 return convertInterval(dataType, value)
 elif dataType.startswith("JSON") and util.isString(value):
 elif dataType.startswith("JSON") and isinstance(value, str):
 return json.loads(value, parse_int=decimal.Decimal,
 parse_float=decimal.Decimal)
 elif dataType.startswith("PERIOD"):
 return convertPeriod(dataType, value)
 return value

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 typeCode = STRING
 if dataType in NUMBER_TYPES:
Expand DownExpand Up@@ -414,6 +445,8 @@ def __str__(self):
 _appendInterval(s, self.seconds, separator=":")
 if self.negative:
 s.insert(0, "-")
 else:
 s.insert(0, " ")
 return "".join(s)

 def __repr__(self):
Expand All@@ -436,6 +469,7 @@ class Period:
 def __init__(self, start, end):
 self.start = start
 self.end = end
 s = "('" + str(start) + "', '" + str(end) + "')"

 def __str__(self):
 return "('" + str(self.start) + "', '" + str(self.end) + "')"
Expand Down

4 changes: 0 additions & 4 deletions
teradata/pulljson.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
import json
import logging
from . import util # @UnusedImport # noqa
if sys.version_info[0] == 2:
 from StringIO import StringIO # @UnresolvedImport #@UnusedImport
else:
 from io import StringIO # @UnresolvedImport @UnusedImport @Reimport # noqa

logger = logging.getLogger(__name__)

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Hd121024 pydbapi 81 py td by htackett · Pull Request #126 · Teradata/PyTd · GitHub
Skip to content
Hd121024 pydbapi 81 py td#126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

htackett
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Hd121024 pydbapi 81 py td
#126
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1a2d917

pydbapi-81


htackett Dec 4, 2020
2362e8b

pydbapi-81


htackett Dec 11, 2020
4319edb

hd121024_pydbapi-81-PyTd


htackett Dec 11, 2020
930e9a1

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020
b6a2719

hd121024_pydbapi-81-PyTd


htackett Dec 12, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1,118 changes: 1,103 additions & 15 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


20 changes: 11 additions & 9 deletions
setup.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,17 @@
# The MIT License (MIT)
#
# Copyright (c) 2015 by Teradata
#
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All@@ -24,19 +24,21 @@
from setuptools import setup

# Make sure correct version of python is being used.
if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and sys.version_info[1] < 7):
 print("The teradata module does not support this version of Python, the version must be 2.7 or later.")
if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 4):
 print("The teradata module does not support this version of Python, the version must be 3.4 or later.")
 sys.exit(1)
with open('teradata/version.py') as f:

with open('teradata/version.py') as f:
 exec(f.read())

setup(name='teradata',
 version=__version__, # @UndefinedVariable
 author = 'Teradata Corporation',
 description='The Teradata python module for DevOps enabled SQL scripting for Teradata UDA.',
 url='http://github.com/teradata/PyTd',
 author='Teradata Corporation',
 author_email='eric.scheie@teradata.com',
 license='MIT',
 packages=['teradata'],
 install_requires=['teradatasql'],
 platforms = ['Windows', 'MacOS X', 'Linux'],
 python_requires = '>=3.4',
 zip_safe=True)

52 changes: 51 additions & 1 deletion
teradata/api.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,24 @@ def emit(self, record):

logging.getLogger("teradata").addHandler(NullHandler())

class InParam ():

 """Represents an input parameter from a Stored Procedure"""

 def __init__(self, value, dataType=None, size=None):
 self.inValue = value
 self.dataType = dataType
 self.size = size
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def setValueFunc(self, valueFunc):
 self.valueFunc = valueFunc

 def value(self):
 return None if self.valueFunc is None else self.valueFunc()

 def __repr__(self):
 return "InParam(value={}, dataType={})".format(self.inValue, self.dataType)

class OutParam ():

Expand DownExpand Up@@ -70,14 +88,44 @@ class InOutParam (OutParam):
 def __init__(self, value, name=None, dataType=None, size=None):
 OutParam.__init__(self, name, dataType, size)
 self.inValue = value
 self.escapeParamType = determineEscapeParamType (dataType, value)

 def __repr__(self):
 return "InOutParam(value={}, name={}, dataType={}, size={})".format(
 self.inValue, self.name, self.dataType, self.size)

# Define exceptions
def determineEscapeParamType (datatype, value):
 from .datatypes import Interval, Period

 if datatype is None or value is None:
 return datatype

 if datatype.endswith ("AS LOCATOR") and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype.startswith (("BYTE", "VARBYTE", "LONG VARBYTE")) and isinstance (value, (bytes, bytearray)):
 return datatype

 if datatype in {"BYTEINT", "BIGINT", "INTEGER", "SMALLINT", "INT"} and isinstance (value, int):
 return datatype

 if datatype.startswith(("INTERVAL", "PERIOD", "DATE", "VARCHAR", "CHAR", "FLOAT", "NUMBER", "DECIMAL", "XML", "LONG VARCHAR")) and isinstance (value, str):
 return datatype

 if datatype.startswith ("INTERVAL") and isinstance (value, Interval):
 return datatype

 if datatype.startswith ("PERIOD") and isinstance (value, Period):
 return datatype

 if datatype.startswith ("TIME"):
 return datatype

 return None
 #end determineEscapeParamType


# Define exceptions
class Warning(Exception): # @ReservedAssignment

 def __init__(self, msg):
Expand DownExpand Up@@ -124,6 +172,7 @@ def __init__(self, code, msg):
class ProgrammingError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand DownExpand Up@@ -152,6 +201,7 @@ def __init__(self, code, msg):
class OperationalError(DatabaseError):

 def __init__(self, code, msg):
 DatabaseError.__init__(self, code, msg)
 self.value = (code, msg)
 self.args = (code, msg)

Expand Down

90 changes: 62 additions & 28 deletions
teradata/datatypes.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,12 @@
hourToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+):(\d+\.?\d*)$")
minuteToSecondIntervalRegEx = re.compile("^(-?)(\d+):(\d+\.?\d*)$")
secondIntervalRegEx = re.compile("^(-?)(\d+\.?\d*)$")
periodRegEx1 = re.compile("\('(.*)',\s*'(.*)'\)")
periodRegEx2 = re.compile("ResultStruct:PERIOD\(.*\)\[(.*),\s*(.*)\]")
periodRegEx = re.compile("(.*),\s*(.*)")

T_BLOB_AS_LOCATOR = 408
T_CLOB_AS_LOCATOR = 424
T_JSON_AS_LOCATOR = 884
T_XML_AS_LOCATOR = 860

NUMBER_TYPES = {"BYTEINT", "BIGINT", "DECIMAL", "DOUBLE", "DOUBLE PRECISION",
 "INTEGER", "NUMBER", "SMALLINT", "FLOAT", "INT", "NUMERIC",
Expand All@@ -55,8 +59,14 @@

FLOAT_TYPES = {"FLOAT", "DOUBLE", "DOUBLE PRECISION", "REAL"}

BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE"}
BINARY_TYPES = {"BLOB", "BYTE", "VARBYTE", "LONG VARBYTE"}

LOB_LOCATOR_TYPES = {
 T_BLOB_AS_LOCATOR : "BLOB AS LOCATOR",
 T_CLOB_AS_LOCATOR : "CLOB AS LOCATOR",
 T_JSON_AS_LOCATOR : "JSON AS LOCATOR",
 T_XML_AS_LOCATOR : "XML AS LOCATOR"
}

def _getMs(m, num):
 ms = m.group(num)
Expand DownExpand Up@@ -134,6 +144,7 @@ def _convertInterval(dataType, value, regEx, *args):

def convertInterval(dataType, value):
 value = value.strip()
 dataType = re.sub (" ?\(([0-9, ]+)\)", "", dataType)
 if dataType == "INTERVAL YEAR":
 return _convertScalarInterval(dataType, value, "years")
 elif dataType == "INTERVAL YEAR TO MONTH":
Expand DownExpand Up@@ -172,9 +183,7 @@ def convertInterval(dataType, value):


def convertPeriod(dataType, value):
 m = periodRegEx1.match(value)
 if not m:
 m = periodRegEx2.match(value)
 m = periodRegEx.match(value)
 if m:
 if "TIMESTAMP" in dataType:
 start = convertTimestamp(m.group(1))
Expand All@@ -187,13 +196,38 @@ def convertPeriod(dataType, value):
 end = convertDate(m.group(2))
 else:
 raise InterfaceError("INVALID_PERIOD",
 "Unknown PERIOD data type: {}".format(
 "Unknown PERIOD data type: {} {}".format(
 dataType, value))
 else:
 raise InterfaceError(
 "INVALID_PERIOD", "{} format invalid: {}".format(dataType, value))
 return Period(start, end)
 #end convertPeriod

def removeTrailingZerosFromPeriod (value):
 if value is None:
 return value
 m = re.compile("\('(.*)',\s*'(.*)'\)").match(str(value))
 if m is not None and len (m.groups()) == 2:
 value = "{},{}".format (removeTrailingZeros (m.group (1)), removeTrailingZeros (m.group (2)))
 return value
 #end convertInParamPeriod

def removeTrailingZerosFromTimeAndTimestamp (value):
 if value is None:
 return value
 return removeTrailingZeros (str(value))

def removeTrailingZeros (value):
 seconds = re.compile(".*(\.[0-9]*).*").match (str(value))

 if seconds is not None:
 sSecond = seconds.group (1).rstrip ('0')
 sSecond = "" if len (sSecond) == 1 else sSecond
 value = re.sub ('\.[0-9]*', sSecond, str(value))

 return value
 #end removeTrailingZeros

def zeroIfNone(value):
 if value is None:
Expand All@@ -205,13 +239,13 @@ class DataTypeConverter:

 """Handles conversion of result set data types into python objects."""

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 raise NotImplementedError(
 "convertValue must be implemented by sub-class")

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 raise NotImplementedError(
 "convertType must be implemented by sub-class")
Expand All@@ -224,62 +258,59 @@ class DefaultDataTypeConverter (DataTypeConverter):
 def __init__(self, useFloat=False):
 self.useFloat = useFloat

 def convertValue(self, dbType, dataType, typeCode, value):
 def convertValue(self, dataType, typeCode, value):
 """Converts the value returned by the database into the desired
 python object."""
 logger.trace(
 "Converting \"%s\" to (%s, %s).", value, dataType, typeCode)
 if value is not None:
 if typeCode == NUMBER:
 try:
 return NUMBER(value)
 except:
 # Handle infinity and NaN for older ODBC drivers.
 if value == "1.#INF":
 return NUMBER('Infinity')
 elif value == "-1.#INF":
 return NUMBER('-Infinity')
 else:
 return NUMBER('NaN')
 return NUMBER(value)
 elif typeCode == float:
 return value if not util.isString else float(value)
 return value if not isinstance(value, str) else float(value)
 elif typeCode == Timestamp:
 if util.isString(value):
 if isinstance(value, str):
 return convertTimestamp(value)
 elif isinstance (value, datetime.date):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS)
 elif typeCode == Time:
 if util.isString(value):
 if isinstance(value, str):
 return convertTime(value)
 elif isinstance (value, datetime.time):
 return (value)
 else:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).time()
 elif typeCode == Date:
 if util.isString(value):
 if isinstance(value, str):
 return convertDate(value)
 else:
 elif isinstance (value, datetime.date):
 return (value)
 elif type (value) is int:
 return datetime.datetime.fromtimestamp(
 value // SECS_IN_MILLISECS).replace(
 microsecond=value % SECS_IN_MILLISECS *
 MILLISECS_IN_MICROSECS).date()
 elif typeCode == BINARY:
 if util.isString(value):
 if isinstance(value, str):
 return bytearray.fromhex(value)
 elif dataType.startswith("INTERVAL"):
 return convertInterval(dataType, value)
 elif dataType.startswith("JSON") and util.isString(value):
 elif dataType.startswith("JSON") and isinstance(value, str):
 return json.loads(value, parse_int=decimal.Decimal,
 parse_float=decimal.Decimal)
 elif dataType.startswith("PERIOD"):
 return convertPeriod(dataType, value)
 return value

 def convertType(self, dbType, dataType):
 def convertType(self, dataType):
 """Converts the data type to a python type code."""
 typeCode = STRING
 if dataType in NUMBER_TYPES:
Expand DownExpand Up@@ -414,6 +445,8 @@ def __str__(self):
 _appendInterval(s, self.seconds, separator=":")
 if self.negative:
 s.insert(0, "-")
 else:
 s.insert(0, " ")
 return "".join(s)

 def __repr__(self):
Expand All@@ -436,6 +469,7 @@ class Period:
 def __init__(self, start, end):
 self.start = start
 self.end = end
 s = "('" + str(start) + "', '" + str(end) + "')"

 def __str__(self):
 return "('" + str(self.start) + "', '" + str(self.end) + "')"
Expand Down

4 changes: 0 additions & 4 deletions
teradata/pulljson.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,10 +28,6 @@
import json
import logging
from . import util # @UnusedImport # noqa
if sys.version_info[0] == 2:
 from StringIO import StringIO # @UnresolvedImport #@UnusedImport
else:
 from io import StringIO # @UnresolvedImport @UnusedImport @Reimport # noqa

logger = logging.getLogger(__name__)

Expand Down
Loading