commit fb1cc4af9c3ff397b0732ddfdeafd826ad54119b · pyrox.dev/nixpkgs

+75

pkgs/development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch

···

       1
       1
       +
       diff --git a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt b/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt

     

       2
       2
       +
       deleted file mode 100644

     

       3
       3
       +
       index 6324d079..00000000

     

       4
       4
       +
       --- a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt

     

       5
       5
       +
       +++ /dev/null

     

       6
       6
       +
       @@ -1,69 +0,0 @@

     

       7
       7
       +
       ---TEST--

     

       8
       8
       +
       -Bug #68849 bindValue is not using the right data type

     

       9
       9
       +
       ---EXTENSIONS--

     

       10
       10
       +
       -sqlite3

     

       11
       11
       +
       ---FILE--

     

       12
       12
       +
       -<?php

     

       13
       13
       +
       -

     

       14
       14
       +
       -$db = new SQLite3(':memory:');

     

       15
       15
       +
       -

     

       16
       16
       +
       -$db->exec("CREATE TABLE test (a INTEGER, b TEXT, c REAL);" .

     

       17
       17
       +
       -        "INSERT INTO test VALUES (1, 'hello', 3.14);" .

     

       18
       18
       +
       -        "INSERT INTO test VALUES (3, 'world', 3.15);" .

     

       19
       19
       +
       -        "INSERT INTO test VALUES (0, '42', 0.42);"

     

       20
       20
       +
       -);

     

       21
       21
       +
       -

     

       22
       22
       +
       -$s = $db->prepare('SELECT * FROM test WHERE (a+2) = ?;');

     

       23
       23
       +
       -$s->bindValue(1, 3);

     

       24
       24
       +
       -$r = $s->execute();

     

       25
       25
       +
       -var_dump($r->fetchArray(SQLITE3_ASSOC));

     

       26
       26
       +
       -

     

       27
       27
       +
       -$s = $db->prepare('SELECT * FROM test WHERE a = ?;');

     

       28
       28
       +
       -$s->bindValue(1, true);

     

       29
       29
       +
       -$r = $s->execute();

     

       30
       30
       +
       -var_dump($r->fetchArray(SQLITE3_ASSOC));

     

       31
       31
       +
       -

     

       32
       32
       +
       -$s = $db->prepare('SELECT * FROM test WHERE a = ?;');

     

       33
       33
       +
       -$s->bindValue(1, false);

     

       34
       34
       +
       -$r = $s->execute();

     

       35
       35
       +
       -var_dump($r->fetchArray(SQLITE3_ASSOC));

     

       36
       36
       +
       -

     

       37
       37
       +
       -$s = $db->prepare('SELECT * FROM test WHERE c = ?;');

     

       38
       38
       +
       -$s->bindValue(1, 3.15);

     

       39
       39
       +
       -$r = $s->execute();

     

       40
       40
       +
       -var_dump($r->fetchArray(SQLITE3_ASSOC));

     

       41
       41
       +
       -

     

       42
       42
       +
       -?>

     

       43
       43
       +
       ---EXPECT--

     

       44
       44
       +
       -array(3) {

     

       45
       45
       +
       -  ["a"]=>

     

       46
       46
       +
       -  int(1)

     

       47
       47
       +
       -  ["b"]=>

     

       48
       48
       +
       -  string(5) "hello"

     

       49
       49
       +
       -  ["c"]=>

     

       50
       50
       +
       -  float(3.14)

     

       51
       51
       +
       -}

     

       52
       52
       +
       -array(3) {

     

       53
       53
       +
       -  ["a"]=>

     

       54
       54
       +
       -  int(1)

     

       55
       55
       +
       -  ["b"]=>

     

       56
       56
       +
       -  string(5) "hello"

     

       57
       57
       +
       -  ["c"]=>

     

       58
       58
       +
       -  float(3.14)

     

       59
       59
       +
       -}

     

       60
       60
       +
       -array(3) {

     

       61
       61
       +
       -  ["a"]=>

     

       62
       62
       +
       -  int(0)

     

       63
       63
       +
       -  ["b"]=>

     

       64
       64
       +
       -  string(2) "42"

     

       65
       65
       +
       -  ["c"]=>

     

       66
       66
       +
       -  float(0.42)

     

       67
       67
       +
       -}

     

       68
       68
       +
       -array(3) {

     

       69
       69
       +
       -  ["a"]=>

     

       70
       70
       +
       -  int(3)

     

       71
       71
       +
       -  ["b"]=>

     

       72
       72
       +
       -  string(5) "world"

     

       73
       73
       +
       -  ["c"]=>

     

       74
       74
       +
       -  float(3.15)

     

       75
       75
       +
       -}

+9 -1

pkgs/top-level/php-packages.nix

···

       600
       600
        
                 doCheck = false;

     

       601
       601
        
               }

     

       602
       602
        
               { name = "sodium"; buildInputs = [ libsodium ]; }

     

       603
       603
       -
               { name = "sqlite3"; buildInputs = [ sqlite ]; }

     

       603
       603
       +
               {

     

       604
       604
       +
                 name = "sqlite3";

     

       605
       605
       +
                 buildInputs = [ sqlite ];

     

       606
       606
       +
       

     

       607
       607
       +
                 # The `sqlite3_bind_bug68849.phpt` test is currently broken for i686 Linux systems since sqlite 3.43, cf.:

     

       608
       608
       +
                 # - https://github.com/php/php-src/issues/12076

     

       609
       609
       +
                 # - https://www.sqlite.org/forum/forumpost/abbb95376ec6cd5f

     

       610
       610
       +
                 patches = lib.optional (stdenv.isi686 && stdenv.isLinux) ../development/interpreters/php/skip-sqlite3_bind_bug68849.phpt.patch;

     

       611
       611
       +
               }

     

       604
       612
        
               { name = "sysvmsg"; }

     

       605
       613
        
               { name = "sysvsem"; }

     

       606
       614
        
               { name = "sysvshm"; }