update database structure dump

diff --git a/build.xml b/build.xml
new file mode 100644 (file)
index 0000000..5af1b9c
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="stapibas" default="dist">
+
+ <target name="dump-db" description="Update data/tables.sql">
+  <exec command="mysqldump --no-data --skip-set-charset -ustapibas -pstapibas stapibas|grep -v '/*!40' |grep -v '^--' |sed 's/AUTO_INCREMENT=[0-9]*//' > data/tables.sql" />
+ </target>
+</project>

diff --git a/data/tables.sql b/data/tables.sql
index b9b2d9819f1e51964b2cf1ff7f7dcdc55054bea1..db96c659e74182a7179343e165839f272d86ce31 100644 (file)
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -1,23 +1,57 @@
-CREATE TABLE IF NOT EXISTS `pingbacks` (
-  `p_id` int(11) NOT NULL AUTO_INCREMENT,
-  `p_source` varchar(1024) NOT NULL,
-  `p_target` varchar(1024) NOT NULL,
-  `p_time` datetime NOT NULL,
-  `p_client_ip` varchar(40) NOT NULL,
-  `p_client_agent` varchar(128) NOT NULL,
-  `p_client_referer` varchar(1024) NOT NULL,
-  PRIMARY KEY (`p_id`),
-  UNIQUE KEY `p_id` (`p_id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8;

 
 
 
 

-CREATE TABLE IF NOT EXISTS `feeds` (
+DROP TABLE IF EXISTS `feedentries`;
+CREATE TABLE `feedentries` (
+  `fe_id` int(11) NOT NULL AUTO_INCREMENT,
+  `fe_f_id` int(11) NOT NULL,
+  `fe_url` varchar(2048) CHARACTER SET utf8 NOT NULL,
+  `fe_updated` datetime NOT NULL,
+  `fe_needs_update` tinyint(1) NOT NULL,
+  PRIMARY KEY (`fe_id`),
+  UNIQUE KEY `fe_id` (`fe_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1;
+
+
+DROP TABLE IF EXISTS `feedentryurls`;
+CREATE TABLE `feedentryurls` (
+  `feu_id` int(11) NOT NULL AUTO_INCREMENT,
+  `feu_fe_id` int(11) NOT NULL,
+  `feu_url` varchar(2048) CHARACTER SET utf8 NOT NULL,
+  `feu_active` tinyint(1) NOT NULL COMMENT 'if the url still exists in the entry',
+  `feu_pinged` tinyint(1) NOT NULL,
+  `feu_updated` datetime NOT NULL,
+  `feu_error` tinyint(1) NOT NULL,
+  `feu_error_code` varchar(6) NOT NULL,
+  `feu_error_message` varchar(128) NOT NULL,
+  `feu_tries` tinyint(4) NOT NULL,
+  `feu_retry` tinyint(1) NOT NULL,
+  PRIMARY KEY (`feu_id`),
+  UNIQUE KEY `feu_id` (`feu_id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1;
+
+
+DROP TABLE IF EXISTS `feeds`;
+CREATE TABLE `feeds` (

   `f_id` int(11) NOT NULL AUTO_INCREMENT,
   `f_id` int(11) NOT NULL AUTO_INCREMENT,

-  `f_url` varchar(2048) NOT NULL,
+  `f_url` varchar(2048) CHARACTER SET utf8 NOT NULL,

   `f_updated` datetime NOT NULL,
   `f_updated` datetime NOT NULL,

-  `f_needs_update` tinyint(4) NOT NULL,
+  `f_needs_update` tinyint(1) NOT NULL,

   PRIMARY KEY (`f_id`),
   UNIQUE KEY `f_id` (`f_id`)
   PRIMARY KEY (`f_id`),
   UNIQUE KEY `f_id` (`f_id`)

+) ENGINE=InnoDB  DEFAULT CHARSET=latin1;
+
+
+DROP TABLE IF EXISTS `pingbacks`;
+CREATE TABLE `pingbacks` (
+  `p_id` int(11) NOT NULL AUTO_INCREMENT,
+  `p_source` varchar(1024) CHARACTER SET latin1 NOT NULL,
+  `p_target` varchar(1024) CHARACTER SET latin1 NOT NULL,
+  `p_time` datetime NOT NULL,
+  `p_client_ip` varchar(40) CHARACTER SET latin1 NOT NULL,
+  `p_client_agent` varchar(128) CHARACTER SET latin1 NOT NULL,
+  `p_client_referer` varchar(1024) CHARACTER SET latin1 NOT NULL,
+  PRIMARY KEY (`p_id`),
+  UNIQUE KEY `p_id` (`p_id`)

 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
 
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
 

diff --git a/src/stapibas/PDO.php b/src/stapibas/PDO.php
index 5dd934ee1e08f237896569e8e146850c5ced709d..7b85906b17ddd90e1808027aa71beb961fbc6b08 100644 (file)
--- a/src/stapibas/PDO.php
+++ b/src/stapibas/PDO.php
@@ -32,6 +32,7 @@ class PDO extends \PDO
         echo "SQL error\n";
         echo " " . $this->errorCode() . "\n";
         echo " " . implode(' - ', $this->errorInfo()) . "\n";
         echo "SQL error\n";
         echo " " . $this->errorCode() . "\n";
         echo " " . implode(' - ', $this->errorInfo()) . "\n";

+        exit(2);

     }
 }
 
     }
 }