Yoshihisa Fukuhara
higef****@users*****
2006年 5月 19日 (金) 11:43:55 JST
Index: affelio/apps/diary/Diary.pm
diff -u affelio/apps/diary/Diary.pm:1.49 affelio/apps/diary/Diary.pm:1.50
--- affelio/apps/diary/Diary.pm:1.49 Fri May 19 02:23:37 2006
+++ affelio/apps/diary/Diary.pm Fri May 19 11:43:54 2006
@@ -74,6 +74,7 @@
my $DBConfig = Config::Tiny->new();
$DBConfig = Config::Tiny->read("$self->{afap}->{af}->{site__user_dir}/db.cfg");
$self->{dbtype} = $DBConfig->{db}->{type};
+ $self->{key1} = get_column_key($self->{db_type});
my @rets;
if ($self->{dbtype} eq 'mysql') {
@@ -135,20 +136,20 @@
#general setting table
if (create_table($self, $self->{pref_table},
"CREATE TABLE $self->{pref_table} (
- key1 TEXT, value TEXT)")){
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('email', '$self->{afap}->{af}->{user__email1}')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('max_entries', '10000')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('max_comments', '256')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('max_commentlen', '1000')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('max_textlen', '10000')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('show_author', '0')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('image_size', '300')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('moblog_popserv', '')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('moblog_popuser', '')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('moblog_poppass', '')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('moblog_author', '')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('moblog_lastcheck', '0')");
- $self->{dbh}->do("INSERT INTO $self->{pref_table} (key1, value) VALUES ('moblog_check_interval', '15')");
+ $self->{key1} TEXT, value TEXT)")){
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('email', '$self->{afap}->{af}->{user__email1}')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('max_entries', '10000')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('max_comments', '256')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('max_commentlen', '1000')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('max_textlen', '10000')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('show_author', '0')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('image_size', '300')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('moblog_popserv', '')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('moblog_popuser', '')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('moblog_poppass', '')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('moblog_author', '')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('moblog_lastcheck', '0')");
+ $self->{dbh}->do("INSERT INTO $self->{pref_table} ($self->{key1}, value) VALUES ('moblog_check_interval', '15')");
}
bless $self, $class;
debug_print("Diary::new: end.");
@@ -442,7 +443,7 @@
my $key = shift;
my $value = shift;
- $diary->{dbh}->do("UPDATE $diary->{pref_table} SET value = '$value' WHERE key1 = '$key'");
+ $diary->{dbh}->do("UPDATE $diary->{pref_table} SET value = '$value' WHERE $diary->{key1} = '$key'");
}
##############################################
@@ -452,7 +453,7 @@
my $diary = shift;
my $key = shift;
- my $query = "SELECT value from $diary->{pref_table} where key1 = '$key'";
+ my $query = "SELECT value from $diary->{pref_table} where $diary->{key1} = '$key'";
my $sth;
my @row =();
$sth = $diary->{dbh}->prepare($query);
@@ -699,5 +700,20 @@
$self->{dbh}->do("INSERT INTO $self->{tb_table} VALUES($id, '$title', '$url', '$excerpt', '$blog_name', $timestamp)");
}
+############################################################################
+# get sql column name: key (temporary)
+############################################################################
+sub get_column_key {
+ my ($db_type) = @_;
+ my $query;
+
+ if ($db_type eq "sqlite"){
+ $query = "key";
+ }else{
+ $query = "key1";
+ }
+ return $query;
+}
+
}
1;