Changeset 881

Timestamp:

12/27/11 18:14:32 (13 years ago)

Author:

nanardon

Message:

• add tools to update database schema
• install sql file and attributes data with software

Location:

LATMOS-Accounts

Files:

• MANIFEST (modified) (1 diff)
• Makefile.PL (modified) (5 diffs)
• bin/la-sql-upgrade.in (added)
• lib/LATMOS/Accounts/Bases/Sql.pm (modified) (2 diffs)
• sqldata/1_to_3.sql (deleted)

LATMOS-Accounts/MANIFEST

@@ -32 +32 @@
 bin/la-sql-regatt
 bin/la-sql-sanity
+bin/la-sql-upgrade.in
 bin/la-sync
 bin/la-sync-list

LATMOS-Accounts/Makefile.PL

@@ -57 +57 @@
         bin/la-sql-regatt
         bin/la-sql-loadatt
+        bin/la-sql-upgrade
         ) ],
         macro => {
@@ -62 +63 @@
             DESTINSTALLMAN5DIR  => '$(DESTDIR)$(INSTALLMAN5DIR)',
             INST_MAN5DIR        => 'blib/man5',
-            DESTRPMDIR          => '$(shell pwd)'
+            DESTRPMDIR          => '$(shell pwd)',
+            DATADIR             => '/usr/share/latmos-accounts',
+            DESTDATADIR         => '$(DESTDIR)$(DATADIR)',
         },
         MAN1PODS        => {
@@ -83 +86 @@
     <<EOF;
 #.PHONY .= svnmanifest
+
+bin/la-sql-upgrade: bin/la-sql-upgrade.in
+\tcat \$< \| sed 's:\@DATADIR\@:\$(DATADIR):' > \$@
+\tchmod +x \$@
 
 svnmanifest:
@@ -134 +141 @@
     my $section = $self->SUPER::install();
 
-    $section =~ s/(^install ::.*)/$1 install_config install_templates/m;
+    $section =~ s/(^install ::.*)/$1 install_config install_templates install_data/m;
     $section =~ s/\$\(INST_BIN\) \$\(DESTINSTALL(\w*)BIN\)/$& \$(INST_MAN5DIR) \$(DESTINSTALLMAN5DIR)/g;
 
@@ -147 +154 @@
 
 install_templates ::
-        install -d $(DESTDIR)/usr/share/latmos-accounts/templates
+        install -d $(DESTDIR)$(DATADIR)/templates
         $(ABSPERLRUN) -MExtUtils::Install -e 'install({ templates => @ARGV })' \\
-                $(DESTDIR)/usr/share/latmos-accounts/templates 
+                $(DESTDIR)$(DATADIR)/templates
+
+install_data ::
+        install -d $(DESTDIR)$(DATADIR)
+        $(ABSPERLRUN) -MExtUtils::Install -e 'install({ sqldata => @ARGV })' \\
+            $(DESTDIR)$(DATADIR)
 ];
   

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql.pm

@@ -83 +83 @@
         $self->{_db}->do(q{set DATESTYLE to 'DMY'});
         $self->log(LA_DEBUG, 'New connection to DB');
-        my $sv = $self->get_global_value('schema_version') || 1;
-        if ($sv < $SCHEMA_VERSION) {
-            $self->log(LA_CRIT,
-                "Schema version %d found, %d is need, please update db for `%s' base",
-                $sv,
-                $SCHEMA_VERSION,
-                $self->label,
-            );
-            # return;
-        }
         return $self->{_db};
     }
@@ -105 +95 @@
 sub load {
     my ($self) = @_;
-    return $self->db ? 1 : 0;    
+    if (!$self->db) { return 0 };
+
+    my $sv = $self->get_global_value('schema_version') || 1;
+    if ($sv < $SCHEMA_VERSION) {
+        $self->log(LA_CRIT,
+            "Schema version %d found, %d is need, please update db for `%s' base",
+            $sv,
+            $SCHEMA_VERSION,
+            $self->label,
+        );
+        # return;
+    }
+
+    1;
 }