summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/databases')
-rw-r--r--lib/sqlalchemy/databases/firebird.py4
-rw-r--r--lib/sqlalchemy/databases/information_schema.py6
-rw-r--r--lib/sqlalchemy/databases/mssql.py8
-rw-r--r--lib/sqlalchemy/databases/mysql.py4
-rw-r--r--lib/sqlalchemy/databases/oracle.py6
-rw-r--r--lib/sqlalchemy/databases/postgres.py10
-rw-r--r--lib/sqlalchemy/databases/sqlite.py7
7 files changed, 22 insertions, 23 deletions
diff --git a/lib/sqlalchemy/databases/firebird.py b/lib/sqlalchemy/databases/firebird.py
index fa090a89e..f38a24b1f 100644
--- a/lib/sqlalchemy/databases/firebird.py
+++ b/lib/sqlalchemy/databases/firebird.py
@@ -253,7 +253,7 @@ class FireBirdDialect(ansisql.ANSIDialect):
# is it a primary key?
kw['primary_key'] = name in pkfields
- table.append_item(schema.Column(*args, **kw))
+ table.append_column(schema.Column(*args, **kw))
row = c.fetchone()
# get the foreign keys
@@ -276,7 +276,7 @@ class FireBirdDialect(ansisql.ANSIDialect):
fk[1].append(refspec)
for name,value in fks.iteritems():
- table.append_item(schema.ForeignKeyConstraint(value[0], value[1], name=name))
+ table.append_constraint(schema.ForeignKeyConstraint(value[0], value[1], name=name))
def last_inserted_ids(self):
diff --git a/lib/sqlalchemy/databases/information_schema.py b/lib/sqlalchemy/databases/information_schema.py
index 291637e9e..5a7369ccd 100644
--- a/lib/sqlalchemy/databases/information_schema.py
+++ b/lib/sqlalchemy/databases/information_schema.py
@@ -144,7 +144,7 @@ def reflecttable(connection, table, ischema_names):
colargs= []
if default is not None:
colargs.append(PassiveDefault(sql.text(default)))
- table.append_item(schema.Column(name, coltype, nullable=nullable, *colargs))
+ table.append_column(schema.Column(name, coltype, nullable=nullable, *colargs))
if not found_table:
raise exceptions.NoSuchTableError(table.name)
@@ -175,7 +175,7 @@ def reflecttable(connection, table, ischema_names):
)
#print "type %s on column %s to remote %s.%s.%s" % (type, constrained_column, referred_schema, referred_table, referred_column)
if type=='PRIMARY KEY':
- table.c[constrained_column]._set_primary_key()
+ table.primary_key.add(table.c[constrained_column])
elif type=='FOREIGN KEY':
try:
fk = fks[constraint_name]
@@ -196,5 +196,5 @@ def reflecttable(connection, table, ischema_names):
fk[1].append(refspec)
for name, value in fks.iteritems():
- table.append_item(ForeignKeyConstraint(value[0], value[1], name=name))
+ table.append_constraint(ForeignKeyConstraint(value[0], value[1], name=name))
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 3d65abf0c..d23c41730 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -446,7 +446,7 @@ class MSSQLDialect(ansisql.ANSIDialect):
if default is not None:
colargs.append(schema.PassiveDefault(sql.text(default)))
- table.append_item(schema.Column(name, coltype, nullable=nullable, *colargs))
+ table.append_column(schema.Column(name, coltype, nullable=nullable, *colargs))
if not found_table:
raise exceptions.NoSuchTableError(table.name)
@@ -478,7 +478,7 @@ class MSSQLDialect(ansisql.ANSIDialect):
c = connection.execute(s)
for row in c:
if 'PRIMARY' in row[TC.c.constraint_type.name]:
- table.c[row[0]]._set_primary_key()
+ table.primary_key.add(table.c[row[0]])
# Foreign key constraints
@@ -498,13 +498,13 @@ class MSSQLDialect(ansisql.ANSIDialect):
scol, rschema, rtbl, rcol, rfknm, fkmatch, fkuprule, fkdelrule = r
if rfknm != fknm:
if fknm:
- table.append_item(schema.ForeignKeyConstraint(scols, ['%s.%s' % (t,c) for (s,t,c) in rcols], fknm))
+ table.append_constraint(schema.ForeignKeyConstraint(scols, ['%s.%s' % (t,c) for (s,t,c) in rcols], fknm))
fknm, scols, rcols = (rfknm, [], [])
if (not scol in scols): scols.append(scol)
if (not (rschema, rtbl, rcol) in rcols): rcols.append((rschema, rtbl, rcol))
if fknm and scols:
- table.append_item(schema.ForeignKeyConstraint(scols, ['%s.%s' % (t,c) for (s,t,c) in rcols], fknm))
+ table.append_constraint(schema.ForeignKeyConstraint(scols, ['%s.%s' % (t,c) for (s,t,c) in rcols], fknm))
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 4443814c5..2fa7e9227 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -353,7 +353,7 @@ class MySQLDialect(ansisql.ANSIDialect):
colargs= []
if default:
colargs.append(schema.PassiveDefault(sql.text(default)))
- table.append_item(schema.Column(name, coltype, *colargs,
+ table.append_column(schema.Column(name, coltype, *colargs,
**dict(primary_key=primary_key,
nullable=nullable,
)))
@@ -397,7 +397,7 @@ class MySQLDialect(ansisql.ANSIDialect):
refcols = [match.group('reftable') + "." + x for x in re.findall(r'`(.+?)`', match.group('refcols'))]
schema.Table(match.group('reftable'), table.metadata, autoload=True, autoload_with=connection)
constraint = schema.ForeignKeyConstraint(columns, refcols, name=match.group('name'))
- table.append_item(constraint)
+ table.append_constraint(constraint)
return tabletype
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index db82e3dea..b9aa09695 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -256,7 +256,7 @@ class OracleDialect(ansisql.ANSIDialect):
if (name.upper() == name):
name = name.lower()
- table.append_item (schema.Column(name, coltype, nullable=nullable, *colargs))
+ table.append_column(schema.Column(name, coltype, nullable=nullable, *colargs))
c = connection.execute(constraintSQL, {'table_name' : table.name.upper(), 'owner' : owner})
@@ -268,7 +268,7 @@ class OracleDialect(ansisql.ANSIDialect):
#print "ROW:" , row
(cons_name, cons_type, local_column, remote_table, remote_column) = row
if cons_type == 'P':
- table.c[local_column]._set_primary_key()
+ table.primary_key.add(table.c[local_column])
elif cons_type == 'R':
try:
fk = fks[cons_name]
@@ -283,7 +283,7 @@ class OracleDialect(ansisql.ANSIDialect):
fk[1].append(refspec)
for name, value in fks.iteritems():
- table.append_item(schema.ForeignKeyConstraint(value[0], value[1], name=name))
+ table.append_constraint(schema.ForeignKeyConstraint(value[0], value[1], name=name))
def do_executemany(self, c, statement, parameters, context=None):
rowcount = 0
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index a28a22cd6..dad2d3bff 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -370,7 +370,7 @@ class PGDialect(ansisql.ANSIDialect):
colargs= []
if default is not None:
colargs.append(PassiveDefault(sql.text(default)))
- table.append_item(schema.Column(name, coltype, nullable=nullable, *colargs))
+ table.append_column(schema.Column(name, coltype, nullable=nullable, *colargs))
if not found_table:
@@ -392,7 +392,7 @@ class PGDialect(ansisql.ANSIDialect):
if row is None:
break
pk = row[0]
- table.c[pk]._set_primary_key()
+ table.primary_key.add(table.c[pk])
# Foreign keys
FK_SQL = """
@@ -443,7 +443,7 @@ class PGDialect(ansisql.ANSIDialect):
for column in referred_columns:
refspec.append(".".join([referred_table, column]))
- table.append_item(ForeignKeyConstraint(constrained_columns, refspec, row['conname']))
+ table.append_constraint(ForeignKeyConstraint(constrained_columns, refspec, row['conname']))
class PGCompiler(ansisql.ANSICompiler):
@@ -502,13 +502,13 @@ class PGSchemaGenerator(ansisql.ANSISchemaGenerator):
return colspec
def visit_sequence(self, sequence):
- if not sequence.optional and not self.engine.dialect.has_sequence(self.connection, sequence.name):
+ if not sequence.optional and (not self.dialect.has_sequence(self.connection, sequence.name)):
self.append("CREATE SEQUENCE %s" % self.preparer.format_sequence(sequence))
self.execute()
class PGSchemaDropper(ansisql.ANSISchemaDropper):
def visit_sequence(self, sequence):
- if not sequence.optional and self.engine.dialect.has_sequence(self.connection, sequence.name):
+ if not sequence.optional and (self.dialect.has_sequence(self.connection, sequence.name)):
self.append("DROP SEQUENCE %s" % sequence.name)
self.execute()
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 80d5a7d2a..90cd66dd3 100644
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -199,7 +199,7 @@ class SQLiteDialect(ansisql.ANSIDialect):
colargs= []
if has_default:
colargs.append(PassiveDefault('?'))
- table.append_item(schema.Column(name, coltype, primary_key = primary_key, nullable = nullable, *colargs))
+ table.append_column(schema.Column(name, coltype, primary_key = primary_key, nullable = nullable, *colargs))
if not found_table:
raise exceptions.NoSuchTableError(table.name)
@@ -228,7 +228,7 @@ class SQLiteDialect(ansisql.ANSIDialect):
if refspec not in fk[1]:
fk[1].append(refspec)
for name, value in fks.iteritems():
- table.append_item(schema.ForeignKeyConstraint(value[0], value[1]))
+ table.append_constraint(schema.ForeignKeyConstraint(value[0], value[1]))
# check for UNIQUE indexes
c = connection.execute("PRAGMA index_list(" + table.name + ")", {})
unique_indexes = []
@@ -250,8 +250,7 @@ class SQLiteDialect(ansisql.ANSIDialect):
col = table.columns[row[2]]
# unique index that includes the pk is considered a multiple primary key
for col in cols:
- column = table.columns[col]
- table.columns[col]._set_primary_key()
+ table.primary_key.add(table.columns[col])
class SQLiteCompiler(ansisql.ANSICompiler):
def visit_cast(self, cast):
View Lorry Controller Status