monikers
dynamic
naming
+ naming_set
datetime_timezone
datetime_locale
config_file
$self->version_to_dump($DBIx::Class::Schema::Loader::VERSION);
$self->schema_version_to_dump($DBIx::Class::Schema::Loader::VERSION);
+ if (not defined $self->naming) {
+ $self->naming_set(0);
+ }
+ else {
+ $self->naming_set(1);
+ }
+
if ((not ref $self->naming) && defined $self->naming) {
my $naming_ver = $self->naming;
$self->{naming} = {
$self->_upgrading_from('v4');
}
- $self->naming->{relationships} ||= 'v4';
- $self->naming->{monikers} ||= 'v4';
-
- if ((not defined $self->use_namespaces)
- && $self->naming->{monikers} ne 'v4') {
+ if ((not defined $self->use_namespaces) && (not $self->naming_set)) {
$self->use_namespaces(1);
}
+ $self->naming->{relationships} ||= 'v4';
+ $self->naming->{monikers} ||= 'v4';
+
if ($self->use_namespaces) {
$self->_upgrading_from_load_classes(1);
}