Migrations dev

pony/__init__.py

@@ -3,7 +3,7 @@
 import os, sys
 from os.path import dirname
 
-__version__ = '0.7.15-dev'
+__version__ = '0.9.0-dev'
 
 def detect_mode():
     try: import google.appengine

pony/orm/dbapiprovider.py

@@ -4,12 +4,15 @@
 import os, re, json
 from decimal import Decimal, InvalidOperation
 from datetime import datetime, date, time, timedelta
+from time import strptime
 from uuid import uuid4, UUID
+from hashlib import md5
 
 import pony
 from pony.utils import is_utf8, decorator, throw, localbase, deprecated
 from pony.converting import str2date, str2time, str2datetime, str2timedelta
 from pony.orm.ormtypes import LongStr, LongUnicode, RawSQLType, TrackedValue, TrackedArray, Json, QueryType, Array
+# from pony.orm.migrations.operations import *
 
 class DBException(Exception):
     def __init__(exc, original_exc, *args):
@@ -97,6 +100,32 @@ def get_version_tuple(s):
         return tuple(int(component) for component in components)
     return None
 
+class Name(unicode):
+    __slots__ = ['obsolete_name', 'autogenerated']
+
+    def __new__(cls, name, obsolete_name=None, autogenerated=True):
+        result = unicode.__new__(cls, name)
+        result.obsolete_name = obsolete_name
+        result.autogenerated = autogenerated
+        return result
+
+    def lower(self):
+        obs_name = self.obsolete_name.lower()
+        name = str(self).lower()
+        return Name(name, obs_name)
+
+    def upper(self):
+        obs_name = self.obsolete_name.upper()
+        name = str(self).upper()
+        return Name(name, obs_name)
+
+
+def obsolete(name):
+    if isinstance(name, tuple):
+        return name[0], getattr(name[1], 'obsolete_name', name[1])
+    return getattr(name, 'obsolete_name', name)
+
+
 class DBAPIProvider(object):
     paramstyle = 'qmark'
     quote_char = '"'
@@ -117,11 +146,17 @@ class DBAPIProvider(object):
     sqlbuilder_cls = None
     array_converter_cls = None
 
+    purge_template = None
+
+    cast_sql = None
+
     name_before_table = 'schema_name'
     default_schema_name = None
 
     fk_types = { 'SERIAL' : 'INTEGER', 'BIGSERIAL' : 'BIGINT' }
 
+    implicit_fk_indexes = False
+
     def __init__(provider, *args, **kwargs):
         pool_mockup = kwargs.pop('pony_pool_mockup', None)
         call_on_connect = kwargs.pop('pony_call_on_connect', None)
@@ -137,8 +172,23 @@ def __init__(provider, *args, **kwargs):
     def inspect_connection(provider, connection):
         pass
 
+    # def normalize_name(provider, name):
+    #     return name[:provider.max_name_len]
+
+    def normalize_case_name(provider, name):
+        return name
+
     def normalize_name(provider, name):
-        return name[:provider.max_name_len]
+        name = provider.normalize_case_name(name)
+        obsolete_name = obsolete(name)
+        max_len = provider.max_name_len
+        if len(name) > max_len:
+            hash = md5(name.encode('utf-8')).hexdigest()[:8]
+            normalized_name = '%s_%s' % (name[:max_len - 9], hash)
+        else:
+            normalized_name = name
+        normalized_obsolete_name = obsolete_name[:max_len]
+        return Name(normalized_name, obsolete_name=normalized_obsolete_name)
 
     def get_default_entity_table_name(provider, entity):
         return provider.normalize_name(entity.__name__)
@@ -207,6 +257,8 @@ def quote_name(provider, name):
         if isinstance(name, basestring):
             name = name.replace(quote_char, quote_char+quote_char)
             return quote_char + name + quote_char
+        if name is None:
+            assert False
         return '.'.join(provider.quote_name(item) for item in name)
 
     def format_table_name(provider, name):
@@ -331,6 +383,9 @@ def drop_table(provider, connection, table_name):
         sql = 'DROP TABLE %s' % provider.quote_name(table_name)
         cursor.execute(sql)
 
+    def purge(provider, connection, schemas):
+        raise NotImplementedError
+
 class Pool(localbase):
     forked_connections = []
     def __init__(pool, dbapi_module, *args, **kwargs): # called separately in each thread
@@ -387,6 +442,13 @@ def __init__(converter, provider, py_type, attr=None):
     def init(converter, kwargs):
         attr = converter.attr
         if attr and attr.args: unexpected_args(attr, attr.args)
+    def make_fk_converter(converter, attr):
+        if not attr.sql_type and converter.attr.sql_type:
+            attr.sql_type = converter.get_fk_type(converter.attr.sql_type)
+        new_converter = converter.__class__(converter.provider, converter.py_type)
+        new_converter.__dict__.update(converter.__dict__)
+        new_converter.attr = attr
+        return new_converter
     def validate(converter, val, obj=None):
         return val
     def py2sql(converter, val):
@@ -399,6 +461,8 @@ def dbval2val(self, dbval, obj=None):
         return dbval
     def dbvals_equal(self, x, y):
         return x == y
+    def sql_type(converter):
+        return None
     def get_sql_type(converter, attr=None):
         if attr is not None and attr.sql_type is not None:
             return attr.sql_type
@@ -455,7 +519,11 @@ def init(converter, kwargs):
         elif max_len is None: max_len = converter.provider.varchar_default_max_len
         elif not isinstance(max_len, int_types):
             throw(TypeError, 'Max length argument must be int. Got: %r' % max_len)
+
         converter.max_len = max_len
+        if converter.attr.provided.args:
+            converter.attr.provided.kwargs['max_len'] = max_len
+            converter.attr.provided.args = []
         converter.db_encoding = kwargs.pop('db_encoding', None)
         converter.autostrip = kwargs.pop('autostrip', True)
     def validate(converter, val, obj=None):
@@ -514,7 +582,7 @@ def init(converter, kwargs):
         if unsigned is not None and size is None: size = 32
         lowest = highest = None
         if size:
-            highest = highest = 2 ** size - 1 if unsigned else 2 ** (size - 1) - 1
+            highest = 2 ** size - 1 if unsigned else 2 ** (size - 1) - 1
             lowest = 0 if unsigned else -(2 ** (size - 1))
 
         if highest is not None and max_val is not None and max_val > highest:
@@ -525,6 +593,7 @@ def init(converter, kwargs):
             throw(ValueError, "'min' argument should be greater or equal to %d because of size=%d and unsigned=%s. "
                               "Got: %d" % (lowest, size, min_val, unsigned))
 
+
         converter.min_val = min_val or lowest
         converter.max_val = max_val or highest
         converter.size = size
@@ -625,8 +694,16 @@ def init(converter, kwargs):
             "'scale' positional argument for attribute %s must be positive. Got: %r" % (attr, scale))
 
         if scale > precision: throw(ValueError, "'scale' must be less or equal 'precision'")
+        attr_kwargs = converter.attr.provided.kwargs
+        attr_args = converter.attr.provided.args
         converter.precision = precision
         converter.scale = scale
+        if len(attr_args) >= 1:
+            attr_kwargs['precision'] = precision
+            if len(attr_args) == 2:
+                attr_kwargs['scale'] = scale
+            converter.attr.provided.args = []
+        converter.attr.provided.args = []
         converter.exp = Decimal(10) ** -scale
 
         min_val = kwargs.pop('min', None)
@@ -672,7 +749,7 @@ def sql2py(converter, val):
         if not isinstance(val, buffer):
             try: val = buffer(val)
             except: pass
-        elif PY2 and converter.attr is not None and converter.attr.is_part_of_unique_index:
+        elif PY2 and converter.attr is not None and converter.attr.real_attr.is_part_of_unique_index:
             try: hash(val)
             except TypeError:
                 val = buffer(val)
@@ -687,8 +764,10 @@ def validate(converter, val, obj=None):
         if isinstance(val, basestring): return str2date(val)
         throw(TypeError, "Attribute %r: expected type is 'date'. Got: %r" % (converter.attr, val))
     def sql2py(converter, val):
-        if not isinstance(val, date): throw(ValueError,
-            'Value of unexpected type received from database: instead of date got %s' % type(val))
+        if isinstance(val, str):
+            val = str2datetime(val).date
+        elif not isinstance(val, date):
+            throw(ValueError, 'Value of unexpected type received from database: instead of date got %s' % type(val))
         return val
     def sql_type(converter):
         return 'DATE'
@@ -702,7 +781,8 @@ def init(converter, kwargs):
         args = attr.args
         if len(args) > 1: throw(TypeError, 'Too many positional parameters for attribute %s. '
                                            'Expected: precision, got: %r' % (attr, args))
-        provider = attr.entity._database_.provider
+        provider = attr.entity.db.provider
+
         if args:
             precision = args[0]
             if 'precision' in kwargs: throw(TypeError,
@@ -714,6 +794,9 @@ def init(converter, kwargs):
             'Precision value (%d) of attribute %s exceeds max datetime precision (%d) of %s %s'
             % (precision, attr, provider.max_time_precision, provider.dialect, provider.server_version))
         converter.precision = precision
+        if converter.attr.provided.args:
+            converter.attr.provided.kwargs['precision'] = precision
+            converter.attr.provided.args = []
     def round_microseconds_to_precision(converter, microseconds, precision):
         # returns None if no change is required
         if not precision: result = 0
@@ -725,7 +808,7 @@ def round_microseconds_to_precision(converter, microseconds, precision):
     def sql_type(converter):
         attr = converter.attr
         precision = converter.precision
-        if not attr or precision == attr.entity._database_.provider.default_time_precision:
+        if not attr or precision == attr.entity.db.schema.provider.default_time_precision:
             return converter.sql_type_name
         return converter.sql_type_name + '(%d)' % precision
 
@@ -767,8 +850,10 @@ def validate(converter, val, obj=None):
         if mcs is not None: val = val.replace(microsecond=mcs)
         return val
     def sql2py(converter, val):
-        if not isinstance(val, datetime): throw(ValueError,
-            'Value of unexpected type received from database: instead of datetime got %s' % type(val))
+        if isinstance(val, str):
+            val = str2datetime(val)
+        elif not isinstance(val, datetime):
+            throw(ValueError, 'Value of unexpected type received from database: instead of datetime got %s' % type(val))
         return val
 
 class UuidConverter(Converter):