From 5991c23e862cb7be141c8aab0b2e645fea32fca1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Mon, 20 Sep 2010 15:44:26 +0200 Subject: [PATCH] Leads aus den ROSE Models entfernt (kommt aus der CRM, wird nicht von der ERP verwaltet) --- SL/DB/Helpers/ALL.pm | 1 - SL/DB/Helpers/Mappings.pm | 6 +++--- SL/DB/Lead.pm | 13 ------------ SL/DB/MetaSetup/Lead.pm | 21 ------------------- ...ation_2.sql => schema_normalization_2.sql} | 1 - 5 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 SL/DB/Lead.pm delete mode 100644 SL/DB/MetaSetup/Lead.pm rename sql/Pg-upgrade2/{schema_nomalization_2.sql => schema_normalization_2.sql} (97%) diff --git a/SL/DB/Helpers/ALL.pm b/SL/DB/Helpers/ALL.pm index 4a258efbe..16184c5a1 100644 --- a/SL/DB/Helpers/ALL.pm +++ b/SL/DB/Helpers/ALL.pm @@ -41,7 +41,6 @@ use SL::DB::Inventory; use SL::DB::Invoice; use SL::DB::InvoiceItem; use SL::DB::Language; -use SL::DB::Lead; use SL::DB::License; use SL::DB::LicenseInvoice; use SL::DB::MakeModel; diff --git a/SL/DB/Helpers/Mappings.pm b/SL/DB/Helpers/Mappings.pm index 7b0c959dd..fe7dc86b9 100644 --- a/SL/DB/Helpers/Mappings.pm +++ b/SL/DB/Helpers/Mappings.pm @@ -2,9 +2,10 @@ package SL::DB::Helpers::Mappings; use strict; -# these will not be managed as Rose::DB models, because they are not normalized -# significant changes are needed to get them done. +# these will not be managed as Rose::DB models, because they are not normalized, +# significant changes are needed to get them done, or they were done by CRM. my @lxoffice_blacklist_permanent = qw( + leads ); # these are not managed _yet_, but will hopefully at some point. @@ -51,7 +52,6 @@ my %lxoffice_package_names = ( inventory => 'inventory', invoice => 'invoice_item', language => 'language', - leads => 'lead', license => 'license', licenseinvoice => 'license_invoice', makemodel => 'make_model', diff --git a/SL/DB/Lead.pm b/SL/DB/Lead.pm deleted file mode 100644 index 0c12c5c3b..000000000 --- a/SL/DB/Lead.pm +++ /dev/null @@ -1,13 +0,0 @@ -# This file has been auto-generated only because it didn't exist. -# Feel free to modify it at will; it will not be overwritten automatically. - -package SL::DB::Lead; - -use strict; - -use SL::DB::MetaSetup::Lead; - -# Creates get_all, get_all_count, get_all_iterator, delete_all and update_all. -__PACKAGE__->meta->make_manager_class; - -1; diff --git a/SL/DB/MetaSetup/Lead.pm b/SL/DB/MetaSetup/Lead.pm deleted file mode 100644 index e12069aac..000000000 --- a/SL/DB/MetaSetup/Lead.pm +++ /dev/null @@ -1,21 +0,0 @@ -# This file has been auto-generated. Do not modify it; it will be overwritten -# by rose_auto_create_model.pl automatically. -package SL::DB::Lead; - -use strict; - -use base qw(SL::DB::Object); - -__PACKAGE__->meta->setup( - table => 'leads', - - columns => [ - id => { type => 'integer', not_null => 1, sequence => 'id' }, - lead => { type => 'varchar', length => 50 }, - ], - - primary_key_columns => [ 'id' ], -); - -1; -; diff --git a/sql/Pg-upgrade2/schema_nomalization_2.sql b/sql/Pg-upgrade2/schema_normalization_2.sql similarity index 97% rename from sql/Pg-upgrade2/schema_nomalization_2.sql rename to sql/Pg-upgrade2/schema_normalization_2.sql index 61143bb41..87ab63692 100644 --- a/sql/Pg-upgrade2/schema_nomalization_2.sql +++ b/sql/Pg-upgrade2/schema_normalization_2.sql @@ -15,7 +15,6 @@ ALTER TABLE follow_up_access ADD COLUMN id SERIAL PRIMARY KEY; ALTER TABLE gifi ADD COLUMN id SERIAL PRIMARY KEY; ALTER TABLE inventory ADD COLUMN id SERIAL PRIMARY KEY; ALTER TABLE licenseinvoice ADD COLUMN id SERIAL PRIMARY KEY; -ALTER TABLE leads ADD PRIMARY KEY (id); ALTER TABLE partsgroup ADD PRIMARY KEY (id); ALTER TABLE partstax ADD COLUMN id SERIAL PRIMARY KEY; ALTER TABLE prices ADD COLUMN id SERIAL PRIMARY KEY; -- 2.20.1