[Yapcom-commit] rev 113 - in yapcom/trunk: . db lib/YAPC

[prev] [thread] [next] [lurker] [Date index for 2003/12/9]

Author: jon
Date: 2003-12-09 13:34:00 +0200 (Tue, 09 Dec 2003)
New Revision: 113

Added:
   yapcom/trunk/db/db.sql
Modified:
   yapcom/trunk/MANIFEST
   yapcom/trunk/lib/YAPC/DBI.pm
Log:
removed sql from DBI.pm to seperate file

Modified: yapcom/trunk/MANIFEST
===================================================================
--- yapcom/trunk/MANIFEST	2003-12-07 12:45:36 UTC (rev 112)
+++ yapcom/trunk/MANIFEST	2003-12-09 11:34:00 UTC (rev 113)
@@ -3,6 +3,7 @@
 META.yml                          no
 README                            no
 db/config.sample
+db/db.sql
 bin/setup.pl                      no
 bin/install.pl                    no
 bin/sqlite.pl                     no

Added: yapcom/trunk/db/db.sql
===================================================================
--- yapcom/trunk/db/db.sql	2003-12-07 12:45:36 UTC (rev 112)
+++ yapcom/trunk/db/db.sql	2003-12-09 11:34:00 UTC (rev 113)
@@ -0,0 +1,41 @@
+CREATE TABLE people (
+             id       INTEGER PRIMARY KEY auto_increment,
+             fname    VARCHAR(20) NOT NULL,
+             lname    VARCHAR(20) NOT NULL,
+             email    VARCHAR(40) UNIQUE NOT NULL,
+             password VARCHAR(10) NOT NULL,
+             authcode VARCHAR(20),
+             acked    VARCHAR(1)  NOT NULL,
+             company  VARCHAR(30),
+             country  VARCHAR(20),
+             state    VARCHAR(20),
+             city     VARCHAR(20),
+             street   VARCHAR(30),
+             zip      VARCHAR(10),
+             phone    VARCHAR(20),
+             pauseid  VARCHAR(20),
+             url      VARCHAR(100),
+             mongers  VARCHAR(100),
+             bio      BLOB,
+             photo    VARCHAR(1),
+             other    VARCHAR(10000)
+) TYPE=INNODB;
+
+CREATE TABLE talks (
+             id       INTEGER PRIMARY KEY auto_increment,
+             user_id  INTEGER NOT NULL,
+             title    VARCHAR(100) NOT NULL,
+             length   INTEGER,
+             language VARCHAR(20),
+             abstract BLOB,
+             accepted INTEGER,
+             other    VARCHAR(10000)
+             ,FOREIGN KEY (user_id) REFERENCES people(id)
+) TYPE=INNODB;
+
+CREATE TABLE login (
+             cookie     VARCHAR(100)  PRIMARY KEY,
+             user_id    INTEGER NOT NULL,
+             timeout    VARCHAR(15) NOT NULL
+             ,FOREIGN KEY (user_id) REFERENCES people(id)
+) TYPE=INNODB;

Modified: yapcom/trunk/lib/YAPC/DBI.pm
===================================================================
--- yapcom/trunk/lib/YAPC/DBI.pm	2003-12-07 12:45:36 UTC (rev 112)
+++ yapcom/trunk/lib/YAPC/DBI.pm	2003-12-09 11:34:00 UTC (rev 113)
@@ -13,12 +13,20 @@
 
 =cut
 
+my $db_dir = $YAPC::Config::db_dir;
+
 sub init_db {
    my $class = shift;
 
    #    croak("Database '$YAPC::Config::db_file' already exists\n") if -e $YAPC::Config::db_file;
+   my $sql;
    my $dbh = $class->db_Main;
-   my $sql = join('', (<DATA>));
+   {
+      local $/ = undef;
+      open SQL, "$db_dir/db.sql" or die "Can't initialize db: missing sql file $db_dir/db.sql";
+      $sql = join('', (<SQL>));
+      close SQL;
+   }
 
    for my $statement (split /;/, $sql) {
       if ($dbh->{Driver}{Name} eq 'SQLite') {

• [Yapcom-commit] rev 113 - in yapcom/trunk: . db lib/YAPC svn 13:34 on 09 Dec 2003

Generated at 17:40 on 09 Dec 2003 by mariachi 0.51