quoting and allowing functions in constraints and indices
* Add distinction of autoinc and regular primary keys to the GraphViz producer
* Fix odd invocation of Test::More::pass() in t/36-filters.t (RT#64728)
+* Quote everything in SQL Server
# ----------------------------------------------------------
# 0.11007 2010-11-30
# ----------------------------------------------------------
# 0.09002 2008-12-05
# ----------------------------------------------------------
-* parsing MySQL CURRENT_TIMESTAMP as scalar ref so it can be produced without
+* parsing MySQL CURRENT_TIMESTAMP as scalar ref so it can be produced without
quotes (jgoulah)
* Add ignore_opts parser arg (to ignore table options) in Parser::MySQL (jgoulah)
* Skip tests for buggy Spreadsheet::ParseExcel versions (rbo)
* Add support for skip tables parser arg in Parser::DBI::MySQL (jgoulah)
-* Changed behaviour of ::Producer::Oracle when returning an array of statements
+* Changed behaviour of ::Producer::Oracle when returning an array of statements
to make it compatible to DBI->do()
* Fixed a few bugs in ::Producer::Oracle
* Applied patch from jgoulah to support mysql's MERGE option
* Applied patch from rbo to add support of multiple database events on a trigger
-* Applied patch from lukes to allow drop if exists in sqlite producer, with
+* Applied patch from lukes to allow drop if exists in sqlite producer, with
version >= 3.3
-* Applied patch from rjbs with minor changes, now we support scalar refs in
+* Applied patch from rjbs with minor changes, now we support scalar refs in
default values!
* Fixed SQLite producer to end index statements in newlines, in scalar context
* Decreed that all list context statements shall not end in ; or ;\n
* Fixed SQLite, Diff and MySQL producers to agree with Decree.
* Added support for CREATE VIEW + tests in the Pg producer (wreis)
* Added support for CREATE VIEW + tests in the sqlite producer (groditi)
-* Added proper argument parsing and documentation to MySQL Parser and
+* Added proper argument parsing and documentation to MySQL Parser and
Producer (ribasushi)
-* Using DROP VIEW instead of OR REPLACE clause in the Pg producer, as replace
+* Using DROP VIEW instead of OR REPLACE clause in the Pg producer, as replace
only allows replacement with identical set of columns (wreis)
-* Added support for DROP VIEW and fixed CREATE VIEW statement in the sqlite
+* Added support for DROP VIEW and fixed CREATE VIEW statement in the sqlite
producer (wreis)
-* Removed source_db and target_db accessors from Diff (throwback to old version,
+* Removed source_db and target_db accessors from Diff (throwback to old version,
only output_db is used)
# ----------------------------------------------------------
* Added support for CREATE VIEW + tests in the mysql producer (groditi)
* Added support for SET fields in the mysql producer + test (groditi)
-* Added support for proper booleans in the mysql producer, when a mysql version
+* Added support for proper booleans in the mysql producer, when a mysql version
of at least 4.x is supplied
-* Added support for proper enums under pg (as of 8.3), with pg version check,
+* Added support for proper enums under pg (as of 8.3), with pg version check,
and deferrable constraints
-* Added support to truncate long constraint and index names in the mysql
- producer, because of a change to DBIx::Class to produce such long names in
+* Added support to truncate long constraint and index names in the mysql
+ producer, because of a change to DBIx::Class to produce such long names in
some cases.
# ----------------------------------------------------------
# ----------------------------------------------------------
* Major refactoring of SQL::Translator::Diff again:
-* Diff is no longer one huge monolithic function.
-* Added more tests for diff
-* When producing diffs for MySQL you will (by default) get single alter
+* Diff is no longer one huge monolithic function.
+* Added more tests for diff
+* When producing diffs for MySQL you will (by default) get single alter
statements per table
-* SQLite can also do remove columns (by creating a temp table as shown in
+* SQLite can also do remove columns (by creating a temp table as shown in
http://sqlite.org/faq.html#q11
* Columns can be renamed if the new schema is from a form that can have metadata
- (which is pretty much anything but an SQL file.) It does this by looking at
- renamed_from in the $field->extra
+ (which is pretty much anything but an SQL file.) It does this by looking at
+ renamed_from in the $field->extra
* Updated Oracle and Postgres producers
* More tests!
# 0.08 2006-12-07
# -----------------------------------------------------------
-* Patched 18ttschema-producer.t and 33tt-table-producter.t to skip on TT 2.15,
+* Patched 18ttschema-producer.t and 33tt-table-producter.t to skip on TT 2.15,
thanks Ash!
# -----------------------------------------------------------
# 0.08_02 2006-11-03
# -----------------------------------------------------------
-* Added patch from Ash to separate DROP statements in mysql producer in
+* Added patch from Ash to separate DROP statements in mysql producer in
list-context
* Fixed up SQLites usage of no-comments
* All schema objects now support the extra attribute, so can
have arbitary name/value data attached to them.
-* Refactoring: Added SQL::Translator::Schema::Object - base
+* Refactoring: Added SQL::Translator::Schema::Object - base
class for all Schema objects.
* Changes to MySQL Parser (Dave Howorth)
# 0.04 2003-11-07
# -----------------------------------------------------------
-* Increased version of Constants module to 1.41 to avoid a problem
+* Increased version of Constants module to 1.41 to avoid a problem
where 0.02 has 1.4 of that file and 0.03 had 1.06 which confused
CPAN
# 0.03 2003-11-06
# -----------------------------------------------------------
-* Added parsers: XML::SQLFairy, Sybase, SQLite, DBI-MySQL,
+* Added parsers: XML::SQLFairy, Sybase, SQLite, DBI-MySQL,
DBI-PostgreSQL, DBI-SQLite, DBI-Sybase, Storable, YAML
* Added producers: XML::SQLFairy, TTSchema, Storable, YAML
* Added "sqlt-dumper" script to help create a script for dumping
a database a la "mysqldump"
-* Reversed the arrowheads on the graphical producers to show the
+* Reversed the arrowheads on the graphical producers to show the
relationships in a more standard way
* Changes all included script names to start with "sqlt"
* Removed "Validator" class as the Schema classes validate themselves
-* Improved all existing parsers and producers, expanding them to
+* Improved all existing parsers and producers, expanding them to
handle foreign keys much better, produce better output, etc.
-* Added sqlt-diagram.pl and sqlt-graphviz.pl as CLI frontends to the
+* Added sqlt-diagram.pl and sqlt-graphviz.pl as CLI frontends to the
graphical producers
* Added sql_translator.cgi as a web-form frontend to graphical producers
# 0.01 2003-02-27
# -----------------------------------------------------------
-* Added parsers: XML::SQLFairy, Sybase, SQLite, DBI-MySQL,
+* Added parsers: XML::SQLFairy, Sybase, SQLite, DBI-MySQL,
DBI-PostgreSQL, DBI-SQLite, DBI-Sybase, Storable, YAML
* Added producers: XML::SQLFairy, TTSchema, Storable, YAML
* Added "sqlt-dumper" script to help create a script for dumping
a database a la "mysqldump"
-* Reversed the arrowheads on the graphical producers to show the
+* Reversed the arrowheads on the graphical producers to show the
relationships in a more standard way
* Changes all included script names to start with "sqlt"
use Data::Dumper;
use SQL::Translator::Schema::Constants;
use SQL::Translator::Utils qw(debug header_comment);
+use SQL::Translator::Shim;
+
+my $shim = SQL::Translator::Shim->new( quote_chars => ['[', ']'] );
my %translate = (
date => 'datetime',
#long => 'varchar',
);
-# TODO - This is still the Sybase list!
-my %reserved = map { $_, 1 } qw[
- ALL ANALYSE ANALYZE AND ANY AS ASC
- BETWEEN BINARY BOTH
- CASE CAST CHECK COLLATE COLUMN CONSTRAINT CROSS
- CURRENT_DATE CURRENT_TIME CURRENT_TIMESTAMP CURRENT_USER
- DEFAULT DEFERRABLE DESC DISTINCT DO
- ELSE END EXCEPT
- FALSE FOR FOREIGN FREEZE FROM FULL
- GROUP HAVING
- ILIKE IN INITIALLY INNER INTERSECT INTO IS ISNULL
- JOIN LEADING LEFT LIKE LIMIT
- NATURAL NEW NOT NOTNULL NULL
- OFF OFFSET OLD ON ONLY OR ORDER OUTER OVERLAPS
- PRIMARY PUBLIC REFERENCES RIGHT
- SELECT SESSION_USER SOME TABLE THEN TO TRAILING TRUE
- UNION UNIQUE USER USING VERBOSE WHEN WHERE
-];
-
# If these datatypes have size appended the sql fails.
my @no_size = qw/tinyint smallint int integer bigint text bit image datetime/;
foreach my $table (
sort { $b->order <=> $a->order } $schema->get_tables
) {
- my $name = unreserve($table->name);
- $output .= qq{IF EXISTS (SELECT name FROM sysobjects WHERE name = '$name' AND type = 'U') DROP TABLE $name;\n\n}
+ my $name = $table->name;
+ my $q_name = unreserve($name);
+ $output .= qq{IF EXISTS (SELECT name FROM sysobjects WHERE name = '$name' AND type = 'U') DROP TABLE $q_name;\n\n}
}
}
my %field_name_scope;
for my $field ( $table->get_fields ) {
my $field_name = $field->name;
- my $field_name_ur = unreserve( $field_name, $table_name );
+ my $field_name_ur = unreserve( $field_name );
my $field_def = qq["$field_name_ur"];
$field_def =~ s/\"//g;
if ( $field_def =~ /identity/ ){
my @constraint_decs = ();
for my $constraint ( $table->get_constraints ) {
my $name = $constraint->name || '';
+ my $name_ur = unreserve($name);
# Make sure we get a unique name
my $type = $constraint->type || NORMAL;
- my @fields = map { unreserve( $_, $table_name ) }
+ my @fields = map { unreserve( $_ ) }
$constraint->fields;
- my @rfields = map { unreserve( $_, $table_name ) }
+ my @rfields = map { unreserve( $_ ) }
$constraint->reference_fields;
next unless @fields;
}
$c_def =
- "ALTER TABLE $table_name ADD CONSTRAINT $name FOREIGN KEY".
+ "ALTER TABLE $table_name_ur ADD CONSTRAINT $name_ur FOREIGN KEY".
' (' . join( ', ', @fields ) . ') REFERENCES '.
- $constraint->reference_table.
+ unreserve($constraint->reference_table).
' (' . join( ', ', @rfields ) . ')'
;
'(' . join( ', ', @fields ) . ')';
}
elsif ( $type eq UNIQUE ) {
- $name ||= mk_name( $table_name . '_uc' );
+ $name = $name_ur || mk_name( $table_name . '_uc' );
$c_def =
"CONSTRAINT $name UNIQUE " .
'(' . join( ', ', @fields ) . ')';
#
for my $index ( $table->get_indices ) {
my $idx_name = $index->name || mk_name($table_name . '_idx');
+ my $idx_name_ur = unreserve($idx_name);
push @index_defs,
- "CREATE INDEX $idx_name ON $table_name (".
- join( ', ', $index->fields ) . ");";
+ "CREATE INDEX $idx_name_ur ON $table_name_ur (".
+ join( ', ', map unreserve($_), $index->fields ) . ");";
}
my $create_statement = "";
$name = substr( $name, 0, $max_id_length )
if ((length( $name ) > $max_id_length) && $critical);
$scope->{ $name }++;
- return $name;
+ return unreserve($name);
}
# -------------------------------------------------------------------
-sub unreserve {
- my $name = shift || '';
- my $schema_obj_name = shift || '';
- my ( $suffix ) = ( $name =~ s/(\W.*)$// ) ? $1 : '';
-
- # also trap fields that don't begin with a letter
- return $name if !$reserved{ uc $name } && $name =~ /^[a-z]/i;
-
- my $unreserve = sprintf '%s_', $name;
- return $unreserve.$suffix;
-}
+sub unreserve { $shim->quote($_[0]) }
1;
projects / dbsrgits/SQL-Translator.git / commitdiff